This commit is contained in:
Branimir Karadžić
2017-02-18 21:29:33 -08:00
parent 5bcbf1bd70
commit db5e1d9b8f
11 changed files with 94 additions and 52 deletions

View File

@@ -8,32 +8,39 @@ local naclToolchain = ""
local function crtNone()
if _OPTIONS["with-crtnone"] then
defines { "BX_CRT_NONE" }
defines {
"BX_CRT_NONE=1",
}
buildoptions {
"-nostdlib",
"-nodefaultlibs",
"-nostartfiles",
"-Wa,--noexecstack",
"-ffreestanding",
}
linkoptions {
"-nostdlib",
"-nodefaultlibs",
"-nostartfiles",
"-Wa,--noexecstack",
"-ffreestanding",
}
configuration { "linux-*" }
buildoptions {
"-nostdlib",
"-nodefaultlibs",
"-nostartfiles",
"-Wa,--noexecstack",
"-ffreestanding",
"-mpreferred-stack-boundary=4",
"-mstackrealign",
}
linkoptions {
"-nostdlib",
"-nodefaultlibs",
"-nostartfiles",
"-Wa,--noexecstack",
"-ffreestanding",
"-mpreferred-stack-boundary=4",
"-mstackrealign",
}
end
configuration {}
end
function toolchain(_buildDir, _libDir)
@@ -546,6 +553,10 @@ function toolchain(_buildDir, _libDir)
flags { "EnableAVX" }
end
if _OPTIONS["with-crtnone"] then
crtNone()
end
flags {
"NoPCH",
"NativeWChar",
@@ -741,9 +752,6 @@ function toolchain(_buildDir, _libDir)
}
buildoptions { "-m64" }
configuration { "linux-*" }
crtNone()
configuration { "linux-clang" }
configuration { "linux-gcc-6" }