diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-07 21:26:40 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-07 21:26:40 +0000 |
| commit | 19eb7ceb451803f047aedc17e5733af8a040a416 (patch) | |
| tree | afb7455d5bf43b92f57207f44d1029a8b05e128c /build | |
| parent | 8c3d969debaf872aaa6f89b506b08ed18078f3a8 (diff) | |
| download | chromium_src-19eb7ceb451803f047aedc17e5733af8a040a416.zip chromium_src-19eb7ceb451803f047aedc17e5733af8a040a416.tar.gz chromium_src-19eb7ceb451803f047aedc17e5733af8a040a416.tar.bz2 | |
Run strip via xcrun.
In Xcode 5, strip is no longer in SYSTEM_DEVELOPER_BIN_DIR. It is only in
DT_TOOLCHAIN_DIR. I also checked Xcode 4.6.1 and found that DT_TOOLCHAIN_DIR
was also set there, and strip is in both SYSTEM_DEVELOPER_BIN_DIR and
DT_TOOLCHAIN_DIR in that version.
Environment variables as set when Xcode is installed at /Applications/Xcode.app:
SYSTEM_DEVELOPER_BIN_DIR=/Applications/Xcode.app/Contents/Developer/usr/bin
DT_TOOLCHAIN_DIR=/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefa
ult.xctoolchain
xcrun should be able to find strip without having to resort to manual
environment interpretation.
R=thakis@chromium.org
Review URL: https://codereview.chromium.org/24352006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227347 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rwxr-xr-x | build/mac/strip_save_dsym | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/build/mac/strip_save_dsym b/build/mac/strip_save_dsym index ef08d83..c325aa8 100755 --- a/build/mac/strip_save_dsym +++ b/build/mac/strip_save_dsym @@ -276,13 +276,7 @@ def strip_and_make_fake_dsym(macho): # Strip the Mach-O file remove_dsym = True try: - strip_path = "" - if "SYSTEM_DEVELOPER_BIN_DIR" in os.environ: - strip_path = os.environ["SYSTEM_DEVELOPER_BIN_DIR"] - else: - strip_path = "/usr/bin" - strip_path = os.path.join(strip_path, "strip") - strip_cmdline = [strip_path] + sys.argv[1:] + strip_cmdline = ['xcrun', 'strip'] + sys.argv[1:] strip_cmd = subprocess.Popen(strip_cmdline) if strip_cmd.wait() == 0: remove_dsym = False |