parent
63e3ec8ce1
commit
d4081c2f97
@ -0,0 +1,24 @@ |
||||
diff -Naur a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py
|
||||
--- a/tools/gyp/pylib/gyp/xcode_emulation.py 2014-01-23 06:05:51.000000000 +0100
|
||||
+++ b/tools/gyp/pylib/gyp/xcode_emulation.py 2014-02-04 17:49:48.000000000 +0100
|
||||
@@ -1018,12 +1033,16 @@
|
||||
# Since the value returned by this function is only used when ARCHS is not
|
||||
# set, then on iOS we return "i386", as the default xcode project generator
|
||||
# does not set ARCHS if it is not set in the .gyp file.
|
||||
- if self.isIOS:
|
||||
+
|
||||
+ try:
|
||||
+ if self.isIOS:
|
||||
+ return 'i386'
|
||||
+ version, build = self._XcodeVersion()
|
||||
+ if version >= '0500':
|
||||
+ return 'x86_64'
|
||||
return 'i386'
|
||||
- version, build = self._XcodeVersion()
|
||||
- if version >= '0500':
|
||||
+ except:
|
||||
return 'x86_64'
|
||||
- return 'i386'
|
||||
|
||||
class MacPrefixHeader(object):
|
||||
"""A class that helps with emulating Xcode's GCC_PREFIX_HEADER feature.
|
@ -0,0 +1,13 @@ |
||||
diff --git a/configure b/configure
|
||||
index d199975..66d903b 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -734,7 +734,7 @@ def configure_library(lib, output):
|
||||
# libpath needs to be provided ahead libraries
|
||||
if pkg_libpath:
|
||||
output['libraries'] += (
|
||||
- filter(None, map(str.strip, pkg_cflags.split('-L'))))
|
||||
+ pkg_libpath.split())
|
||||
|
||||
default_libs = getattr(options, shared_lib + '_libname')
|
||||
default_libs = map('-l{0}'.format, default_libs.split(','))
|
Loading…
Reference in new issue