diff options
| author | ruki <[email protected]> | 2015-06-16 11:38:50 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2015-06-16 11:38:50 +0800 |
| commit | b02e5fc9da96945b0be2452bdbbf5b9801e68b69 (patch) | |
| tree | 5e0826167d0b63eea1721fbb17f4fca89525bde1 /xmake/scripts/platform | |
| parent | 60bd22effb5664fefafabe69f5023301b6970e7b (diff) | |
modify the compiler and linker command
Diffstat (limited to 'xmake/scripts/platform')
| -rw-r--r-- | xmake/scripts/platform/iphoneos/iphoneos.lua | 1 | ||||
| -rw-r--r-- | xmake/scripts/platform/iphoneos/prober.lua | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/xmake/scripts/platform/iphoneos/iphoneos.lua b/xmake/scripts/platform/iphoneos/iphoneos.lua index 9b9b4dd50..c02513b08 100644 --- a/xmake/scripts/platform/iphoneos/iphoneos.lua +++ b/xmake/scripts/platform/iphoneos/iphoneos.lua @@ -52,6 +52,7 @@ function iphoneos.make(configs) configs.tools.cxx = config.get("cxx") configs.tools.mm = config.get("mm") configs.tools.mxx = config.get("mxx") + configs.tools.as = config.get("as") configs.tools.ld = config.get("ld") configs.tools.ar = config.get("ar") configs.tools.sh = config.get("sh") diff --git a/xmake/scripts/platform/iphoneos/prober.lua b/xmake/scripts/platform/iphoneos/prober.lua index 00b59b205..1d6b34f2c 100644 --- a/xmake/scripts/platform/iphoneos/prober.lua +++ b/xmake/scripts/platform/iphoneos/prober.lua @@ -241,7 +241,7 @@ function prober._probe_toolchains(configs) if not prober._probe_toolpath(configs, "cxx", "xcrun -sdk iphoneos ", "clang++", "the c++ compiler") then return false end if not prober._probe_toolpath(configs, "mm", "xcrun -sdk iphoneos ", "clang", "the objc compiler") then return false end if not prober._probe_toolpath(configs, "mxx", "xcrun -sdk iphoneos ", "clang++", "the objc++ compiler") then return false end - if not prober._probe_toolpath(configs, "as", "xcrun -sdk iphoneos ", "clang", "the assember") then return false end + if not prober._probe_toolpath(configs, "as", xmake._SCRIPTS_DIR .. "/tools/gas-preprocessor.pl xcrun -sdk iphoneos ", "clang", "the assember") then return false end if not prober._probe_toolpath(configs, "ld", "xcrun -sdk iphoneos ", "clang++", "the linker") then return false end if not prober._probe_toolpath(configs, "ar", "xcrun -sdk iphoneos ", "ar", "the static library linker") then return false end if not prober._probe_toolpath(configs, "sh", "xcrun -sdk iphoneos ", "clang++", "the shared library linker") then return false end |