Mirrors/bx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bx.git synced 2026-02-17 20:52:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed C++ options.

Browse Source
This commit is contained in:
Branimir Karadžić
2015-03-26 19:53:10 -07:00
parent 859fa7229e
commit 0c2e21eb77
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/toolchain.lua
View File

@@ -494,7 +494,7 @@ function toolchain(_buildDir, _libDir)
} }
buildoptions_cpp { buildoptions_cpp {
"-std=c++0x", "-std=c++0x",
} }
links { links {
"rt", "rt",
"dl", "dl",
@@ -558,7 +558,6 @@ function toolchain(_buildDir, _libDir)
} }
buildoptions { buildoptions {
"-fPIC", "-fPIC",
"-std=c++0x",
"-no-canonical-prefixes", "-no-canonical-prefixes",
"-Wa,--noexecstack", "-Wa,--noexecstack",
"-fstack-protector", "-fstack-protector",
@@ -567,6 +566,9 @@ function toolchain(_buildDir, _libDir)
"-Wunused-value", "-Wunused-value",
"-Wundef", "-Wundef",
} }
buildoptions_cpp {
"-std=c++0x",
}
linkoptions { linkoptions {
"-no-canonical-prefixes", "-no-canonical-prefixes",
"-Wl,--no-undefined", "-Wl,--no-undefined",
@@ -670,7 +672,6 @@ function toolchain(_buildDir, _libDir)
configuration { "nacl or nacl-arm or pnacl" } configuration { "nacl or nacl-arm or pnacl" }
buildoptions { buildoptions {
"-std=c++0x",
"-U__STRICT_ANSI__", -- strcasecmp, setenv, unsetenv,... "-U__STRICT_ANSI__", -- strcasecmp, setenv, unsetenv,...
"-fno-stack-protector", "-fno-stack-protector",
"-fdiagnostics-show-option", "-fdiagnostics-show-option",
@@ -679,6 +680,9 @@ function toolchain(_buildDir, _libDir)
"-Wunused-value", "-Wunused-value",
"-Wundef", "-Wundef",
} }
buildoptions_cpp {
"-std=c++0x",
}
includedirs { includedirs {
"$(NACL_SDK_ROOT)/include", "$(NACL_SDK_ROOT)/include",
path.join(bxDir, "include/compat/nacl"), path.join(bxDir, "include/compat/nacl"),
@@ -831,11 +835,13 @@ function toolchain(_buildDir, _libDir)
libdirs { path.join(_libDir, "lib/qnx-arm") } libdirs { path.join(_libDir, "lib/qnx-arm") }
-- includedirs { path.join(bxDir, "include/compat/qnx") } -- includedirs { path.join(bxDir, "include/compat/qnx") }
buildoptions { buildoptions {
"-std=c++0x",
"-Wno-psabi", -- note: the mangling of 'va_list' has changed in GCC 4.4.0 "-Wno-psabi", -- note: the mangling of 'va_list' has changed in GCC 4.4.0
"-Wunused-value", "-Wunused-value",
"-Wundef", "-Wundef",
} }
buildoptions_cpp {
"-std=c++0x",
}
configuration { "rpi" } configuration { "rpi" }
targetdir (path.join(_buildDir, "rpi/bin")) targetdir (path.join(_buildDir, "rpi/bin"))