Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(179)

Side by Side Diff: pylib/gyp/xcode_emulation.py

Issue 1213123002: Fix XCode emulation when SDK is not installed. Base URL: https://chromium.googlesource.com/external/gyp@master
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 Google Inc. All rights reserved. 1 # Copyright (c) 2012 Google Inc. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 """ 5 """
6 This module contains classes that help to emulate xcodebuild behavior on top of 6 This module contains classes that help to emulate xcodebuild behavior on top of
7 other build systems, such as make and ninja. 7 other build systems, such as make and ninja.
8 """ 8 """
9 9
10 import copy 10 import copy
(...skipping 1461 matching lines...) Expand 10 before | Expand all | Expand 10 after
1472 install_name = xcode_settings.GetInstallName() 1472 install_name = xcode_settings.GetInstallName()
1473 if install_name: 1473 if install_name:
1474 env['LD_DYLIB_INSTALL_NAME'] = install_name 1474 env['LD_DYLIB_INSTALL_NAME'] = install_name
1475 install_name_base = xcode_settings.GetInstallNameBase() 1475 install_name_base = xcode_settings.GetInstallNameBase()
1476 if install_name_base: 1476 if install_name_base:
1477 env['DYLIB_INSTALL_NAME_BASE'] = install_name_base 1477 env['DYLIB_INSTALL_NAME_BASE'] = install_name_base
1478 if XcodeVersion() >= '0500' and not env.get('SDKROOT'): 1478 if XcodeVersion() >= '0500' and not env.get('SDKROOT'):
1479 sdk_root = xcode_settings._SdkRoot(configuration) 1479 sdk_root = xcode_settings._SdkRoot(configuration)
1480 if not sdk_root: 1480 if not sdk_root:
1481 sdk_root = xcode_settings._XcodeSdkPath('') 1481 sdk_root = xcode_settings._XcodeSdkPath('')
1482 if sdk_root is None:
1483 sdk_root = ''
1482 env['SDKROOT'] = sdk_root 1484 env['SDKROOT'] = sdk_root
Nico 2015/06/29 16:25:19 Is it useful to set SDKROOT to an empty string? Sh
sdefresne 2015/06/29 16:48:59 IIUC this CL is to get Xcode emulation working whe
1483 1485
1484 if not additional_settings: 1486 if not additional_settings:
1485 additional_settings = {} 1487 additional_settings = {}
1486 else: 1488 else:
1487 # Flatten lists to strings. 1489 # Flatten lists to strings.
1488 for k in additional_settings: 1490 for k in additional_settings:
1489 if not isinstance(additional_settings[k], str): 1491 if not isinstance(additional_settings[k], str):
1490 additional_settings[k] = ' '.join(additional_settings[k]) 1492 additional_settings[k] = ' '.join(additional_settings[k])
1491 additional_settings.update(env) 1493 additional_settings.update(env)
1492 1494
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
1601 if toolset == 'target': 1603 if toolset == 'target':
1602 iphoneos_config_dict['xcode_settings']['SDKROOT'] = 'iphoneos' 1604 iphoneos_config_dict['xcode_settings']['SDKROOT'] = 'iphoneos'
1603 return targets 1605 return targets
1604 1606
1605 def CloneConfigurationForDeviceAndEmulator(target_dicts): 1607 def CloneConfigurationForDeviceAndEmulator(target_dicts):
1606 """If |target_dicts| contains any iOS targets, automatically create -iphoneos 1608 """If |target_dicts| contains any iOS targets, automatically create -iphoneos
1607 targets for iOS device builds.""" 1609 targets for iOS device builds."""
1608 if _HasIOSTarget(target_dicts): 1610 if _HasIOSTarget(target_dicts):
1609 return _AddIOSDeviceConfigurations(target_dicts) 1611 return _AddIOSDeviceConfigurations(target_dicts)
1610 return target_dicts 1612 return target_dicts
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698