diff options
author | 2015-09-14 10:43:49 +1000 | |
---|---|---|
committer | 2015-09-14 10:43:49 +1000 | |
commit | 884e4460ae32fbe78f75412cbb104019eea7eea3 (patch) | |
tree | 547ce5fd51157127195146d4aee4c2e2bef553bf /scripts/toolchain.lua | |
parent | 1a7f8ce3ec2fe4cfbaaac2a74b66a28a61058e96 (diff) |
Fix the build.
Diffstat (limited to 'scripts/toolchain.lua')
-rw-r--r-- | scripts/toolchain.lua | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index 76d3ab5c4b7..e04c8199003 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -195,14 +195,9 @@ function toolchain(_buildDir, _subDir) end premake.gcc.cc = "$(MINGW32)/bin/i686-w64-mingw32-gcc" premake.gcc.cxx = "$(MINGW32)/bin/i686-w64-mingw32-g++" --- lto docs say to use gcc-ar so that plugin is completely setup, but this doesn't work in Windows with the current buildtool's version of gcc-ar.exe --- if you are using LTO=1 you must have GCC 5.0+ - - if _OPTIONS["LTO"]=="1" then - premake.gcc.ar = "$(MINGW32)/bin/i686-w64-mingw32-gcc-ar" - else - premake.gcc.ar = "$(MINGW32)/bin/i686-w64-mingw32-ar" - end + premake.gcc.ar = "$(MINGW32)/bin/ar" +-- lto docs say to use gcc-ar so that plugin is completely setup, but this doesn't work in windows with the current build tools' copy of gcc-ar.exe +-- premake.gcc.ar = "$(MINGW32)/bin/gcc-ar" location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-mingw32-gcc") end @@ -212,15 +207,9 @@ function toolchain(_buildDir, _subDir) end premake.gcc.cc = "$(MINGW64)/bin/x86_64-w64-mingw32-gcc" premake.gcc.cxx = "$(MINGW64)/bin/x86_64-w64-mingw32-g++" --- lto docs say to use gcc-ar so that plugin is completely setup, but this doesn't work in Windows with the current buildtool's version of gcc-ar.exe --- if you are using LTO=1 you must have GCC 5.0+ - - if _OPTIONS["LTO"]=="1" then - premake.gcc.ar = "$(MINGW64)/bin/x86_64-w64-mingw32-gcc-ar" - else - premake.gcc.ar = "$(MINGW64)/bin/x86_64-w64-mingw32-ar" - end - + premake.gcc.ar = "$(MINGW64)/bin/ar" +-- lto docs say to use gcc-ar so that plugin is completely setup, but this doesn't work in windows with the current build tools' copy of gcc-ar.exe +-- premake.gcc.ar = "$(MINGW64)/bin/gcc-ar" location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-mingw64-gcc") end |