summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--scripts/genie.lua10
-rw-r--r--scripts/src/3rdparty.lua8
2 files changed, 10 insertions, 8 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 33715a6b3e4..19c892d6c65 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -1086,6 +1086,16 @@ end
"-Wno-pragma-pack" -- clang 6.0 complains when the packing change lifetime is not contained within a header file.
}
end
+ if ((version < 60000) or (_OPTIONS["targetos"]=="macosx" and (version <= 90000))) then
+ buildoptions {
+ "-Wno-missing-braces" -- std::array brace initialization not fixed until 6.0.0 (https://reviews.llvm.org/rC314838)
+ }
+ end
+ if (_OPTIONS["targetos"]=="macosx" and (version < 80000)) then
+ defines {
+ "TARGET_OS_OSX=1",
+ }
+ end
else
if (version < 70000) then
print("GCC version 7.0 or later needed")
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 41909b6c271..52e5d862168 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -1385,14 +1385,6 @@ end
end
end
- if _OPTIONS["targetos"]=="macosx" and _OPTIONS["gcc"]~=nil then
- if string.find(_OPTIONS["gcc"], "clang") and (version < 80000) then
- defines {
- "TARGET_OS_OSX=1",
- }
- end
- end
-
defines {
"__STDC_LIMIT_MACROS",
"__STDC_FORMAT_MACROS",