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

Unified Diff: build/mac/find_sdk.py

Issue 2412353003: Remove direct references to hermetic mac toolchain. (Closed)
Patch Set: Remove unused import. Created 4 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: build/mac/find_sdk.py
diff --git a/build/mac/find_sdk.py b/build/mac/find_sdk.py
index f06fd15c1687da556d7c1702f682129f669b99f0..5172df3999bd11b69019d89451a628ca95c4856e 100755
--- a/build/mac/find_sdk.py
+++ b/build/mac/find_sdk.py
@@ -4,10 +4,11 @@
# found in the LICENSE file.
"""Prints the lowest locally available SDK version greater than or equal to a
-given minimum sdk version to standard output.
+given minimum sdk version to standard output. If --developer_dir is passed, then
+the script will use the Xcode toolchain located at DEVELOPER_DIR.
Usage:
- python find_sdk.py 10.6 # Ignores SDKs < 10.6
+ python find_sdk.py [--developer_dir DEVELOPER_DIR] 10.6 # Ignores SDKs < 10.6
"""
import os
@@ -15,9 +16,6 @@ import re
import subprocess
import sys
-sys.path.append(os.path.dirname(os.path.dirname(__file__)))
-import mac_toolchain
-
from optparse import OptionParser
@@ -37,13 +35,14 @@ def main():
parser.add_option("--print_sdk_path",
action="store_true", dest="print_sdk_path", default=False,
help="Additionaly print the path the SDK (appears first).")
+ parser.add_option("--developer_dir", help='Path to Xcode.')
options, args = parser.parse_args()
if len(args) != 1:
parser.error('Please specify a minimum SDK version')
min_sdk_version = args[0]
- # Try using the toolchain in mac_files.
- mac_toolchain.SetToolchainEnvironment()
+ if options.developer_dir:
+ os.environ['DEVELOPER_DIR'] = options.developer_dir
job = subprocess.Popen(['xcode-select', '-print-path'],
stdout=subprocess.PIPE,
« no previous file with comments | « build/gyp_environment.py ('k') | build/mac_toolchain.py » ('j') | tools/clang/scripts/update.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698