add flags for platform

6 files changed, 21 insertions, 12 deletions

diff --git a/xmake/scripts/base/compiler.lua b/xmake/scripts/base/compiler.lua
index 50bf38c5c..23378f061 100644
--- a/xmake/scripts/base/compiler.lua
+++ b/xmake/scripts/base/compiler.lua
@@ -32,6 +32,7 @@ local table     = require("base/table")
 local string    = require("base/string")
 local config    = require("base/config")
 local tools     = require("tools/tools")
+local platform  = require("platform/platform")
 
 -- map gcc flag to the given compiler flag
 function compiler._mapflag(module, flag)
diff --git a/xmake/scripts/base/linker.lua b/xmake/scripts/base/linker.lua
index 0019ca6b9..8767e49c4 100644
--- a/xmake/scripts/base/linker.lua
+++ b/xmake/scripts/base/linker.lua
@@ -29,6 +29,7 @@ local table     = require("base/table")
 local string    = require("base/string")
 local config    = require("base/config")
 local tools     = require("tools/tools")
+local platform  = require("platform/platform")
 
 -- map gcc flag to the given linker flag
 function linker._mapflag(module, flag)
diff --git a/xmake/scripts/platform/iphoneos/iphoneos.lua b/xmake/scripts/platform/iphoneos/iphoneos.lua
index 75f8453a3..3d8538e2a 100644
--- a/xmake/scripts/platform/iphoneos/iphoneos.lua
+++ b/xmake/scripts/platform/iphoneos/iphoneos.lua
@@ -56,6 +56,12 @@ function iphoneos.make(configs)
     -- init xcode sdk directory
     configs.xcode_sdkdir    = config.get("xcode_dir") .. "/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS" .. config.get("xcode_sdkver") .. ".sdk"
 
+    -- init flags
+    configs.cxflags         = "-isysroot " .. configs.xcode_sdkdir
+    configs.mxflags         = "-isysroot " .. configs.xcode_sdkdir
+    configs.ldflags         = "-isysroot " .. configs.xcode_sdkdir
+    configs.shflags         = "-isysroot " .. configs.xcode_sdkdir
+
 end
 
 -- get the option menu for action: xmake config or global
diff --git a/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua b/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua
index fb9fd7e3e..effab15c3 100644
--- a/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua
+++ b/xmake/scripts/platform/iphonesimulator/iphonesimulator.lua
@@ -56,6 +56,12 @@ function iphonesimulator.make(configs)
     -- init xcode sdk directory
     configs.xcode_sdkdir    = config.get("xcode_dir") .. "/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator" .. config.get("xcode_sdkver") .. ".sdk"
 
+    -- init flags
+    configs.cxflags         = "-isysroot " .. configs.xcode_sdkdir
+    configs.mxflags         = "-isysroot " .. configs.xcode_sdkdir
+    configs.ldflags         = "-isysroot " .. configs.xcode_sdkdir
+    configs.shflags         = "-isysroot " .. configs.xcode_sdkdir
+
 end
 
 -- get the option menu for action: xmake config or global
diff --git a/xmake/scripts/platform/macosx/macosx.lua b/xmake/scripts/platform/macosx/macosx.lua
index 7b8d40e4d..5bdc6f1f3 100644
--- a/xmake/scripts/platform/macosx/macosx.lua
+++ b/xmake/scripts/platform/macosx/macosx.lua
@@ -55,6 +55,13 @@ function macosx.make(configs)
 
     -- init xcode sdk directory
     configs.xcode_sdkdir    = config.get("xcode_dir") .. "/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX" .. config.get("xcode_sdkver") .. ".sdk"
+
+    -- init flags
+    configs.cxflags         = "-isysroot " .. configs.xcode_sdkdir
+    configs.mxflags         = "-isysroot " .. configs.xcode_sdkdir
+    configs.ldflags         = "-isysroot " .. configs.xcode_sdkdir
+    configs.shflags         = "-isysroot " .. configs.xcode_sdkdir
+
 end
 
 -- get the option menu for action: xmake config or global
diff --git a/xmake/scripts/tools/gcc.lua b/xmake/scripts/tools/gcc.lua
index b74081222..cc94a1ab5 100644
--- a/xmake/scripts/tools/gcc.lua
+++ b/xmake/scripts/tools/gcc.lua
@@ -93,18 +93,6 @@ function gcc.init(self, name)
         self.shflags = { flags_arch, "-shared -Wl,-soname" }
     end
 
-    -- append the xcode sdk directory if exists
-    local plat = config.get("plat")
-    if plat and (plat == "macosx" or plat == "iphoneos" or plat == "iphonesimulator") then
-        local xcode_sdkdir = platform.get("xcode_sdkdir")
-        if xcode_sdkdir then
-            table.join2(self.cxflags, "-isysroot " .. xcode_sdkdir)
-            table.join2(self.mxflags, "-isysroot " .. xcode_sdkdir)
-            table.join2(self.ldflags, "-isysroot " .. xcode_sdkdir)
-            table.join2(self.shflags, "-isysroot " .. xcode_sdkdir)
-        end
-    end
-
     -- suppress warning for the ccache bug
     if name:find("clang") and config.get("ccache") then
         table.join2(self.cxflags, "-Qunused-arguments")