summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2020-10-10 00:39:29 +0800
committerruki <[email protected]>2020-10-10 00:39:29 +0800
commitdf375449368d5d6b03ed70f5fdeaa4256319b985 (patch)
tree8ed8de728b64b16ce3090c89f03835bc99859bd7
parent81fa9a4e57fcc3a91dbdd6f1bc9f5bf6eaa33d3c (diff)
improve mingw toolchain
-rw-r--r--xmake/toolchains/mingw/xmake.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/xmake/toolchains/mingw/xmake.lua b/xmake/toolchains/mingw/xmake.lua
index 230879d17..fcd7d9dad 100644
--- a/xmake/toolchains/mingw/xmake.lua
+++ b/xmake/toolchains/mingw/xmake.lua
@@ -67,7 +67,7 @@ toolchain("mingw")
toolchain:add("toolset", "mrc", path.join(bindir, "windres"))
end
toolchain:add("toolset", "cc", cross .. "gcc")
- toolchain:add("toolset", "cxx", cross .. "gcc", cross .. "g++")
+ toolchain:add("toolset", "cxx", cross .. "g++", cross .. "gcc")
toolchain:add("toolset", "cpp", cross .. "gcc -E")
toolchain:add("toolset", "as", cross .. "gcc")
toolchain:add("toolset", "ld", cross .. "g++", cross .. "gcc")
@@ -81,7 +81,7 @@ toolchain("mingw")
-- we use bin/gcc.exe if cross not found
-- @see https://github.com/xmake-io/xmake/issues/977#issuecomment-704863677
toolchain:add("toolset", "cc", path.join(bindir, "gcc"))
- toolchain:add("toolset", "cxx", path.join(bindir, "gcc"), path.join(bindir, "g++"))
+ toolchain:add("toolset", "cxx", path.join(bindir, "g++"), path.join(bindir, "gcc"))
toolchain:add("toolset", "cpp", path.join(bindir, "gcc -E"))
toolchain:add("toolset", "as", path.join(bindir, "gcc"))
toolchain:add("toolset", "ld", path.join(bindir, "g++"), path.join(bindir, "gcc"))