diff options
| author | ruki <[email protected]> | 2018-12-19 22:48:13 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2018-12-19 10:49:18 +0800 |
| commit | 1758e5f01e5684bf8da0187bb5b6ee7ac93fd4e6 (patch) | |
| tree | e5879bdf6d8f98432fd0e34912864b6b57998f6e /xmake/platforms/linux | |
| parent | 998aedba0b07b6b7605272b99e6dc0d59e5c8ac6 (diff) | |
improve mingw
Diffstat (limited to 'xmake/platforms/linux')
| -rw-r--r-- | xmake/platforms/linux/check.lua | 4 | ||||
| -rw-r--r-- | xmake/platforms/linux/load.lua | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/xmake/platforms/linux/check.lua b/xmake/platforms/linux/check.lua index 87a225eec..b226ab206 100644 --- a/xmake/platforms/linux/check.lua +++ b/xmake/platforms/linux/check.lua @@ -51,10 +51,10 @@ function _toolchains(config) -- find cross toolchain local cross = "" - local toolchain = find_cross_toolchain(config.get("sdk") or config.get("bin"), {bin = config.get("bin"), cross = config.get("cross")}) + local toolchain = find_cross_toolchain(config.get("sdk") or config.get("bin"), {bindir = config.get("bin"), cross = config.get("cross")}) if toolchain then config.set("cross", toolchain.cross, {readonly = true, force = true}) - config.set("bin", toolchain.bin, {readonly = true, force = true}) + config.set("bin", toolchain.bindir, {readonly = true, force = true}) cross = toolchain.cross end diff --git a/xmake/platforms/linux/load.lua b/xmake/platforms/linux/load.lua index e6af9a61a..72e48e096 100644 --- a/xmake/platforms/linux/load.lua +++ b/xmake/platforms/linux/load.lua @@ -34,8 +34,14 @@ function main(platform) -- init linkdirs and includedirs local sdkdir = config.get("sdk") if sdkdir then - platform:add("includedirs", path.join(sdkdir, "include")) - platform:add("linkdirs", path.join(sdkdir, "lib")) + local includedir = path.join(sdkdir, "include") + if os.isdir(includedir) then + platform:add("includedirs", includedir) + end + local linkdir = path.join(sdkdir, "lib") + if os.isdir(linkdir) then + platform:add("linkdirs", linkdir) + end end -- ok |