···

       
1
       
1
       
-
       
diff --git a/configure b/configure

     

       
2
       
2
       
-
       
index d199975..66d903b 100755

     

       
3
       
3
       
-
       
--- a/configure

     

       
4
       
4
       
-
       
+++ b/configure

     

       
5
       
5
       
-
       
@@ -734,7 +734,7 @@ def configure_library(lib, output):

     

       
6
       
6
       
-
       
     # libpath needs to be provided ahead libraries

     

       
7
       
7
       
-
       
     if pkg_libpath:

     

       
8
       
8
       
-
       
       output['libraries'] += (

     

       
9
       
9
       
-
       
-          filter(None, map(str.strip, pkg_cflags.split('-L'))))

     

       
10
       
10
       
-
       
+          pkg_libpath.split())

     

       
11
       
11
       
-
       
 

     

       
12
       
12
       
-
       
     default_libs = getattr(options, shared_lib + '_libname')

     

       
13
       
13
       
-
       
     default_libs = map('-l{0}'.format, default_libs.split(','))

     

       
14
       
14
       
-
       
diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py

     

       
15
       
15
       
-
       
index c002b11..fefb765 100644

     

       
16
       
16
       
-
       
--- a/tools/gyp/pylib/gyp/xcode_emulation.py

     

       
17
       
17
       
-
       
+++ b/tools/gyp/pylib/gyp/xcode_emulation.py

     

       
18
       
18
       
-
       
@@ -446,10 +446,17 @@ class XcodeSettings(object):

     

       
19
       
19
       
-
       
 

     

       
20
       
20
       
-
       
   def _XcodeSdkPath(self, sdk_root):

     

       
21
       
21
       
-
       
     if sdk_root not in XcodeSettings._sdk_path_cache:

     

       
22
       
22
       
-
       
-      sdk_path = self._GetSdkVersionInfoItem(sdk_root, 'Path')

     

       
23
       
23
       
-
       
-      XcodeSettings._sdk_path_cache[sdk_root] = sdk_path

     

       
24
       
24
       
-
       
-      if sdk_root:

     

       
25
       
25
       
-
       
-        XcodeSettings._sdk_root_cache[sdk_path] = sdk_root

     

       
26
       
26
       
-
       
+      try:

     

       
27
       
27
       
-
       
+        sdk_path = self._GetSdkVersionInfoItem(sdk_root, 'Path')

     

       
28
       
28
       
-
       
+        XcodeSettings._sdk_path_cache[sdk_root] = sdk_path

     

       
29
       
29
       
-
       
+        if sdk_root:

     

       
30
       
30
       
-
       
+          XcodeSettings._sdk_root_cache[sdk_path] = sdk_root

     

       
31
       
31
       
-
       
+      except:

     

       
32
       
32
       
-
       
+        # if this fails it's because xcodebuild failed, which means

     

       
33
       
33
       
-
       
+        # the user is probably on a CLT-only system, where there

     

       
34
       
34
       
-
       
+        # is no valid SDK root

     

       
35
       
35
       
-
       
+        XcodeSettings._sdk_path_cache[sdk_root] = None

     

       
36
       
36
       
-
       
+        

     

       
37
       
37
       
-
       
     return XcodeSettings._sdk_path_cache[sdk_root]

     

       
38
       
38
       
-
       
 

     

       
39
       
39
       
-
       
   def _AppendPlatformVersionMinFlags(self, lst):

     

       
40
       
40
       
-
       
@@ -572,10 +579,12 @@ class XcodeSettings(object):

     

       
41
       
41
       
-
       
       framework_root = sdk_root

     

       
42
       
42
       
-
       
     else:

     

       
43
       
43
       
-
       
       framework_root = ''

     

       
44
       
44
       
-
       
-    config = self.spec['configurations'][self.configname]

     

       
45
       
45
       
-
       
-    framework_dirs = config.get('mac_framework_dirs', [])

     

       
46
       
46
       
-
       
-    for directory in framework_dirs:

     

       
47
       
47
       
-
       
-      cflags.append('-F' + directory.replace('$(SDKROOT)', framework_root))

     

       
48
       
48
       
-
       
+    

     

       
49
       
49
       
-
       
+    if 'SDKROOT' in self._Settings():

     

       
50
       
50
       
-
       
+      config = self.spec['configurations'][self.configname]

     

       
51
       
51
       
-
       
+      framework_dirs = config.get('mac_framework_dirs', [])

     

       
52
       
52
       
-
       
+      for directory in framework_dirs:

     

       
53
       
53
       
-
       
+        cflags.append('-F' + directory.replace('$(SDKROOT)', framework_root))

     

       
54
       
54
       
-
       
 

     

       
55
       
55
       
-
       
     self.configname = None

     

       
56
       
56
       
-
       
     return cflags

     

       
57
       
57
       
-
       
@@ -826,10 +835,12 @@ class XcodeSettings(object):

     

       
58
       
58
       
-
       
     sdk_root = self._SdkPath()

     

       
59
       
59
       
-
       
     if not sdk_root:

     

       
60
       
60
       
-
       
       sdk_root = ''

     

       
61
       
61
       
-
       
-    config = self.spec['configurations'][self.configname]

     

       
62
       
62
       
-
       
-    framework_dirs = config.get('mac_framework_dirs', [])

     

       
63
       
63
       
-
       
-    for directory in framework_dirs:

     

       
64
       
64
       
-
       
-      ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root))

     

       
65
       
65
       
-
       
+    

     

       
66
       
66
       
-
       
+    if 'SDKROOT' in self._Settings():

     

       
67
       
67
       
-
       
+      config = self.spec['configurations'][self.configname]

     

       
68
       
68
       
-
       
+      framework_dirs = config.get('mac_framework_dirs', [])

     

       
69
       
69
       
-
       
+      for directory in framework_dirs:

     

       
70
       
70
       
-
       
+        ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root))

     

       
71
       
71
       
-
       
 

     

       
72
       
72
       
-
       
     is_extension = self._IsIosAppExtension() or self._IsIosWatchKitExtension()

     

       
73
       
73
       
-
       
     if sdk_root and is_extension:

     

       
74
       
74
       
-
       
@@ -1032,7 +1043,11 @@ class XcodeSettings(object):

     

       
75
       
75
       
-
       
     sdk_root = self._SdkPath(config_name)

     

       
76
       
76
       
-
       
     if not sdk_root:

     

       
77
       
77
       
-
       
       sdk_root = ''

     

       
78
       
78
       
-
       
-    return l.replace('$(SDKROOT)', sdk_root)

     

       
79
       
79
       
-
       
+    

     

       
80
       
80
       
-
       
+    if self._SdkPath():

     

       
81
       
81
       
-
       
+      return l.replace('$(SDKROOT)', sdk_root)

     

       
82
       
82
       
-
       
+    else:

     

       
83
       
83
       
-
       
+      return l

     

       
84
       
84
       
-
       
 

     

       
85
       
85
       
-
       
   def AdjustLibraries(self, libraries, config_name=None):

     

       
86
       
86
       
-
       
     """Transforms entries like 'Cocoa.framework' in libraries into entries like

     

       
87
       
87
       
-
       
@@ -1248,7 +1263,7 @@ def XcodeVersion():

     

       
88
       
88
       
-
       
     if version:

     

       
89
       
89
       
-
       
       version = re.match(r'(\d\.\d\.?\d*)', version).groups()[0]

     

       
90
       
90
       
-
       
     else:

     

       
91
       
91
       
-
       
-      raise GypError("No Xcode or CLT version detected!")

     

       
92
       
92
       
-
       
+      version = "7.0.0"

     

       
93
       
93
       
-
       
     # The CLT has no build information, so we return an empty string.

     

       
94
       
94
       
-
       
     version_list = [version, '']

     

       
95
       
95
       
-
       
   version = version_list[0]