diff options
| author | ruki <[email protected]> | 2018-01-09 23:14:53 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2018-01-09 13:29:19 +0800 |
| commit | 2fc03e778ad00bef537b5adb6cd40b70a64a2a96 (patch) | |
| tree | 58e767ce6babca7eb57d3356a7abf5134faae2b9 | |
| parent | a7fc2b62d71be4282545e3d4613d05bb2a94f65b (diff) | |
fix cross config error
| -rw-r--r-- | CHANGELOG.md | 8 | ||||
| -rw-r--r-- | xmake/platforms/cross/check.lua | 4 | ||||
| -rw-r--r-- | xmake/platforms/linux/check.lua | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ff64eb032..419da7f1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ * Support to run xmake on linux (arm, arm64) * Improve to generate vs201x project plugin +### Bugs fixed + +* Fix `xmake f --cross` error + ## v2.1.9 ### New features @@ -429,6 +433,10 @@ * 增加对linux/arm, arm64的支持，可以在arm linux上运行xmake * 改进vs201x工程生成插件，更好的includedirs设置支持 +## Bugs修复 + +* 修复`xmake f --cross`无法配置问题 + ## v2.1.9 ### 新特性 diff --git a/xmake/platforms/cross/check.lua b/xmake/platforms/cross/check.lua index bbedb3675..183a20985 100644 --- a/xmake/platforms/cross/check.lua +++ b/xmake/platforms/cross/check.lua @@ -48,8 +48,8 @@ function _toolchains(config) local cross = "" for _, toolchain in ipairs(find_cross_toolchains(config.get("sdk") or config.get("toolchains"), {bin = config.get("toolchains"), cross = config.get("cross")})) do if toolchain.bin and toolchain.cross then - config.set("cross", toolchain.cross) - config.set("toolchains", toolchain.bin) + config.set("cross", toolchain.cross, {readonly = true, force = true}) + config.set("toolchains", toolchain.bin, {readonly = true, force = true}) cross = toolchain.cross break end diff --git a/xmake/platforms/linux/check.lua b/xmake/platforms/linux/check.lua index 393794221..7ecbb400f 100644 --- a/xmake/platforms/linux/check.lua +++ b/xmake/platforms/linux/check.lua @@ -53,8 +53,8 @@ function _toolchains(config) local cross = "" for _, toolchain in ipairs(find_cross_toolchains(config.get("sdk") or config.get("toolchains"), {bin = config.get("toolchains"), cross = config.get("cross")})) do if toolchain.bin and toolchain.cross then - config.set("cross", toolchain.cross) - config.set("toolchains", toolchain.bin) + config.set("cross", toolchain.cross, {readonly = true, force = true}) + config.set("toolchains", toolchain.bin, {readonly = true, force = true}) cross = toolchain.cross break end |