diff options
| author | ruki <[email protected]> | 2020-05-16 10:59:10 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-05-16 10:59:10 +0800 |
| commit | d021df166bfd45c2d18ae6fa39cd685006491d01 (patch) | |
| tree | 00ae776fe15fc6f70c30877b1b2eaeba2cd3d4f8 /xmake/platforms/android | |
| parent | 87a0828f8d20d3a1a83aed640e6e77560668e488 (diff) | |
rename dlang, rust, swift, go ldflags
Diffstat (limited to 'xmake/platforms/android')
| -rw-r--r-- | xmake/platforms/android/config.lua | 2 | ||||
| -rw-r--r-- | xmake/platforms/android/load.lua | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/xmake/platforms/android/config.lua b/xmake/platforms/android/config.lua index f199d08ba..e99a4d14a 100644 --- a/xmake/platforms/android/config.lua +++ b/xmake/platforms/android/config.lua @@ -81,7 +81,7 @@ function _toolchains() local rc_sh = toolchain("the rust shared library linker") local rc_ar = toolchain("the rust static library archiver") local toolchains = {cc = cc, cxx = cxx, cpp = cpp, as = as, ld = ld, sh = sh, ar = ar, ex = ex, ranlib = ranlib, strip = strip, - rc = rc, ["rc-ld"] = rc_ld, ["rc-sh"] = rc_sh, ["rc-ar"] = rc_ar} + rc = rc, ["rcld"] = rc_ld, ["rcsh"] = rc_sh, ["rcar"] = rc_ar} -- init the c compiler cc:add({name = "gcc", cross = cross}, "clang") diff --git a/xmake/platforms/android/load.lua b/xmake/platforms/android/load.lua index b0ed21ba3..773d69fcc 100644 --- a/xmake/platforms/android/load.lua +++ b/xmake/platforms/android/load.lua @@ -305,15 +305,15 @@ function main(platform) if targets_rust[arch] then platform:add("rcflags", "--target=" .. targets_rust[arch]) end - platform:add("rc-shflags", "-C link-args=\"" .. (table.concat(platform:get("shflags"), " "):gsub("%-march=.-%s", "") .. "\"")) - platform:add("rc-ldflags", "-C link-args=\"" .. (table.concat(platform:get("ldflags"), " "):gsub("%-march=.-%s", "") .. "\"")) + platform:add("rcshflags", "-C link-args=\"" .. (table.concat(platform:get("shflags"), " "):gsub("%-march=.-%s", "") .. "\"")) + platform:add("rcldflags", "-C link-args=\"" .. (table.concat(platform:get("ldflags"), " "):gsub("%-march=.-%s", "") .. "\"")) local sh = config.get("sh") if sh then - platform:add("rc-shflags", "-C linker=" .. sh) + platform:add("rcshflags", "-C linker=" .. sh) end local ld = config.get("ld") if ld then - platform:add("rc-ldflags", "-C linker=" .. ld) + platform:add("rcldflags", "-C linker=" .. ld) end end |