diff options
| author | ruki <[email protected]> | 2015-06-04 15:23:45 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2015-06-04 15:23:45 +0800 |
| commit | 83295bd3a1b27f844759aeadbbdc23f51e2f2d89 (patch) | |
| tree | e4d371b95497d791b07af5f0224aea40dfe647dd /xmake/scripts/platform/macosx | |
| parent | 740fa0e8d4948a7261bcbb19fe7c3ac16f1df041 (diff) | |
move clang compiler and linker to tools
Diffstat (limited to 'xmake/scripts/platform/macosx')
| -rw-r--r-- | xmake/scripts/platform/macosx/macosx.lua | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/xmake/scripts/platform/macosx/macosx.lua b/xmake/scripts/platform/macosx/macosx.lua index 4591293f0..bad818081 100644 --- a/xmake/scripts/platform/macosx/macosx.lua +++ b/xmake/scripts/platform/macosx/macosx.lua @@ -42,21 +42,15 @@ function _macosx.make(configs) configs.formats.shared = {"lib", ".dylib"} -- init the toolchains - configs.tools = {} + configs.tools = {} configs.tools.make = "make" - - -- init the compiler - configs.compiler = {} - configs.compiler.cc = config.get("cc") or "xcrun -sdk macosx clang" - configs.compiler.cxx = config.get("cxx") or "xcrun -sdk macosx clang++" - configs.compiler.mm = config.get("mm") or configs.compiler.cc - configs.compiler.mxx = config.get("mxx") or configs.compiler.cxx - - -- init the linker - configs.linker = {} - configs.linker.binary = config.get("ld") or "xcrun -sdk macosx clang++" - configs.linker.static = config.get("ar") or "xcrun -sdk macosx ar" - configs.linker.shared = config.get("sh") or "xcrun -sdk macosx clang++" + configs.tools.cc = config.get("cc") or "xcrun -sdk macosx clang" + configs.tools.cxx = config.get("cxx") or "xcrun -sdk macosx clang++" + configs.tools.mm = config.get("mm") or configs.tools.cc + configs.tools.mxx = config.get("mxx") or configs.tools.cxx + configs.tools.ld = config.get("ld") or "xcrun -sdk macosx clang++" + configs.tools.ar = config.get("ar") or "xcrun -sdk macosx ar" + configs.tools.sh = config.get("sh") or "xcrun -sdk macosx clang++" -- init xcode sdk directory configs.xcode_sdkdir = config.get("xcode_dir") .. "/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX" .. config.get("xcode_sdkver") .. ".sdk" |