diff options
| author | ruki <[email protected]> | 2018-06-06 22:38:43 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2018-06-06 09:52:23 +0800 |
| commit | ef2499fe3cefcee0182c1da11742ebc5b0736b70 (patch) | |
| tree | cdf5e65fb48608336a83b14371d1b6f20c4ddbbc /xmake/platforms/android/load.lua | |
| parent | 46b5924bdda83869b68ce2470ee4d6ab0de83c7a (diff) | |
improve load android platform
Diffstat (limited to 'xmake/platforms/android/load.lua')
| -rw-r--r-- | xmake/platforms/android/load.lua | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/xmake/platforms/android/load.lua b/xmake/platforms/android/load.lua index 74745b998..ffb9bef27 100644 --- a/xmake/platforms/android/load.lua +++ b/xmake/platforms/android/load.lua @@ -151,8 +151,16 @@ function main() -- init flags for rust _g.rcflags = { "--target=" .. targets[arch] } - _g["rc-shflags"] = { "-C linker=" .. config.get("sh"), "-C link-args=\"" .. (table.concat(_g.shflags, " "):gsub("%-march=.-%s", "") .. "\"")} - _g["rc-ldflags"] = { "-C linker=" .. config.get("ld"), "-C link-args=\"" .. (table.concat(_g.ldflags, " "):gsub("%-march=.-%s", "") .. "\"")} + _g["rc-shflags"] = { "-C link-args=\"" .. (table.concat(_g.shflags, " "):gsub("%-march=.-%s", "") .. "\"")} + _g["rc-ldflags"] = { "-C link-args=\"" .. (table.concat(_g.ldflags, " "):gsub("%-march=.-%s", "") .. "\"")} + local sh = config.get("sh") + if sh then + table.insert(_g["rc-shflags"], "-C linker=" .. sh) + end + local ld = config.get("ld") + if ld then + table.insert(_g["rc-ldflags"], "-C linker=" .. ld) + end -- ok return _g |