summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Scott Stone <tafoid@gmail.com>2015-10-05 18:33:52 -0400
committer Scott Stone <tafoid@gmail.com>2015-10-05 18:33:52 -0400
commit74ffae801aa32c47c04670ee06f98f1c0da42979 (patch)
tree984aefc695618779fb3a5c451e558576efa3c57a
parent83bed156ddd5a4f4e5b5d2019a09e5c9c326b521 (diff)
Fixing compiling issue for release toolchain (per Balrog) (nw)
-rw-r--r--scripts/toolchain.lua8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index 44ade18da1b..08712050751 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -198,10 +198,10 @@ function toolchain(_buildDir, _subDir)
-- work around GCC 4.9.2 not having proper linker for LTO=1 usage
local version_4_ar = str_to_version(_OPTIONS["gcc_version"])
if (version_4_ar < 50000) then
- premake.gcc.ar = "$(MINGW32)/bin/i686-w64-mingw32-ar"
+ premake.gcc.ar = "$(MINGW32)/bin/ar"
end
if (version_4_ar >= 50000) then
- premake.gcc.ar = "$(MINGW32)/bin/i686-w64-mingw32-gcc-ar"
+ premake.gcc.ar = "$(MINGW32)/bin/gcc-ar"
end
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-mingw32-gcc")
end
@@ -215,10 +215,10 @@ function toolchain(_buildDir, _subDir)
-- work around GCC 4.9.2 not having proper linker for LTO=1 usage
local version_4_ar = str_to_version(_OPTIONS["gcc_version"])
if (version_4_ar < 50000) then
- premake.gcc.ar = "$(MINGW64)/bin/x86_64-w64-mingw32-ar"
+ premake.gcc.ar = "$(MINGW64)/bin/ar"
end
if (version_4_ar >= 50000) then
- premake.gcc.ar = "$(MINGW64)/bin/x86_64-w64-mingw32-gcc-ar"
+ premake.gcc.ar = "$(MINGW64)/bin/gcc-ar"
end
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-mingw64-gcc")
end