This commit is contained in:
Бранимир Караџић
2022-11-13 19:32:47 -08:00
parent 69ad3d2826
commit c013d1ecba

View File

@@ -73,7 +73,6 @@ function toolchain(_buildDir, _libDir)
{ "freebsd", "FreeBSD" }, { "freebsd", "FreeBSD" },
{ "linux-gcc", "Linux (GCC compiler)" }, { "linux-gcc", "Linux (GCC compiler)" },
{ "linux-gcc-afl", "Linux (GCC + AFL fuzzer)" }, { "linux-gcc-afl", "Linux (GCC + AFL fuzzer)" },
{ "linux-gcc-6", "Linux (GCC-6 compiler)" },
{ "linux-clang", "Linux (Clang compiler)" }, { "linux-clang", "Linux (Clang compiler)" },
{ "linux-clang-afl", "Linux (Clang + AFL fuzzer)" }, { "linux-clang-afl", "Linux (Clang + AFL fuzzer)" },
{ "linux-mips-gcc", "Linux (MIPS, GCC compiler)" }, { "linux-mips-gcc", "Linux (MIPS, GCC compiler)" },
@@ -288,12 +287,6 @@ function toolchain(_buildDir, _libDir)
premake.gcc.ar = "ar" premake.gcc.ar = "ar"
location (path.join(_buildDir, "projects", _ACTION .. "-linux")) location (path.join(_buildDir, "projects", _ACTION .. "-linux"))
elseif "linux-gcc-6" == _OPTIONS["gcc"] then
premake.gcc.cc = "gcc-6"
premake.gcc.cxx = "g++-6"
premake.gcc.ar = "ar"
location (path.join(_buildDir, "projects", _ACTION .. "-linux"))
elseif "linux-clang" == _OPTIONS["gcc"] then elseif "linux-clang" == _OPTIONS["gcc"] then
premake.gcc.cc = "clang" premake.gcc.cc = "clang"
premake.gcc.cxx = "clang++" premake.gcc.cxx = "clang++"
@@ -661,19 +654,6 @@ function toolchain(_buildDir, _libDir)
configuration { "linux-*" } configuration { "linux-*" }
includedirs { path.join(bxDir, "include/compat/linux") } includedirs { path.join(bxDir, "include/compat/linux") }
configuration { "linux-gcc-6" }
buildoptions {
-- "-fno-omit-frame-pointer",
-- "-fsanitize=address",
-- "-fsanitize=undefined",
-- "-fsanitize=float-divide-by-zero",
-- "-fsanitize=float-cast-overflow",
}
links {
-- "asan",
-- "ubsan",
}
configuration { "linux-gcc" } configuration { "linux-gcc" }
buildoptions { buildoptions {
"-mfpmath=sse", "-mfpmath=sse",