diff options
| author | ruki <[email protected]> | 2020-10-08 00:18:00 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-10-08 00:18:00 +0800 |
| commit | b55d5390291ca9fefc3cd3b47e62bc6fcf8acb52 (patch) | |
| tree | 807d3a184ded5357435f933ae7af558c4e4bf4ae | |
| parent | c15ba078768e3b3f591b1aab71ead1c91858aee0 (diff) | |
improve mingw toolchain
| -rw-r--r-- | xmake/toolchains/mingw/xmake.lua | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/xmake/toolchains/mingw/xmake.lua b/xmake/toolchains/mingw/xmake.lua index b1ac338f6..230879d17 100644 --- a/xmake/toolchains/mingw/xmake.lua +++ b/xmake/toolchains/mingw/xmake.lua @@ -77,6 +77,16 @@ toolchain("mingw") toolchain:add("toolset", "strip", cross .. "strip") toolchain:add("toolset", "ranlib", cross .. "ranlib") toolchain:add("toolset", "mrc", cross .. "windres") + if is_host("windows") and bindir then + -- 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", "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")) + toolchain:add("toolset", "sh", path.join(bindir, "g++"), path.join(bindir, "gcc")) + end -- init flags for architecture local archflags = nil |