mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-22 13:29:00 +02:00
6602f49495
This reverts commit 741bf840da.
This reverts the fallout from reverting the major changes.
25 lines
936 B
Diff
25 lines
936 B
Diff
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.
|