mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-23 14:13:35 +00:00
c3da83cd40
Issues addressed:
- xcode build failed with
... was built for newer OSX version (10.10) than being linked (10.5)
fixed by setting GYP mac deployment target to the nix value
- a gyp bug when SDKROOT is not set (and removed an orphaned gyp patch
- path to python in generated gyp-mac-tool
- noisy build due to static assert warnings, by silencing warnings
- use of system xcodebuild and libtool replaced by darwin.cctools
13 lines
365 B
Diff
13 lines
365 B
Diff
--- a/pylib/gyp/xcode_emulation.py
|
|
+++ b/pylib/gyp/xcode_emulation.py
|
|
@@ -1470,7 +1470,8 @@
|
|
sdk_root = xcode_settings._SdkRoot(configuration)
|
|
if not sdk_root:
|
|
sdk_root = xcode_settings._XcodeSdkPath('')
|
|
- env['SDKROOT'] = sdk_root
|
|
+ if sdk_root:
|
|
+ env['SDKROOT'] = sdk_root
|
|
|
|
if not additional_settings:
|
|
additional_settings = {}
|