summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/toolchain.lua
diff options
context:
space:
mode:
author Lord-Nightmare <Lord-Nightmare@users.noreply.github.com>2015-07-23 14:28:23 -0400
committer Lord-Nightmare <Lord-Nightmare@users.noreply.github.com>2015-07-23 14:28:23 -0400
commit68a39e8e69b7b24fa3354e361b9074cf1f0588f0 (patch)
tree44e2ab2ddb411993c7f78d1e8c84373dc91ce3a3 /scripts/toolchain.lua
parent40303822359d4843bf41c9733406258f5df69602 (diff)
semi-revert the change of ar.exe to gcc-ar.exe; the latter is broken in the current build tools, needs to be replaced with a working copy (n/w)
Diffstat (limited to 'scripts/toolchain.lua')
-rw-r--r--scripts/toolchain.lua12
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index 15948b563bb..934f5a96610 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -194,9 +194,9 @@ function toolchain(_buildDir, _subDir)
end
premake.gcc.cc = "$(MINGW32)/bin/i686-w64-mingw32-gcc"
premake.gcc.cxx = "$(MINGW32)/bin/i686-w64-mingw32-g++"
--- premake.gcc.ar = "$(MINGW32)/bin/ar"
--- lto docs say to use gcc-ar so that plugin is completely setup
- premake.gcc.ar = "$(MINGW32)/bin/gcc-ar"
+ 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
@@ -206,9 +206,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++"
--- premake.gcc.ar = "$(MINGW64)/bin/ar"
--- lto docs say to use gcc-ar so that plugin is completely setup
- premake.gcc.ar = "$(MINGW64)/bin/gcc-ar"
+ 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