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

Unified Diff: native_client_sdk/src/build_tools/build_artifacts.py

Issue 1684883002: [NaCl SDK] Remove old/unused gyp defines (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@irt_with_clang
Patch Set: Created 4 years, 10 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
« no previous file with comments | « no previous file | native_client_sdk/src/build_tools/build_sdk.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: native_client_sdk/src/build_tools/build_artifacts.py
diff --git a/native_client_sdk/src/build_tools/build_artifacts.py b/native_client_sdk/src/build_tools/build_artifacts.py
index 9cde147f6508bb3955ffc7b5f4a6db3d14b063aa..2a7c4b7d806388f57b63cdd5dc26d846ffcd0913 100755
--- a/native_client_sdk/src/build_tools/build_artifacts.py
+++ b/native_client_sdk/src/build_tools/build_artifacts.py
@@ -200,8 +200,7 @@ def NinjaBuild(targets, out_dir):
def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets, out_dir):
gyp_env = dict(os.environ)
- gyp_env['GYP_GENERATORS'] = 'ninja'
- gyp_defines = ['nacl_allow_thin_archives=0']
+ gyp_defines = []
if options.mac_sdk:
gyp_defines.append('mac_sdk=%s' % options.mac_sdk)
if arch:
@@ -210,8 +209,6 @@ def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets, out_dir):
gyp_env['GYP_CROSSCOMPILE'] = '1'
if options.no_arm_trusted:
gyp_defines.append('disable_cross_trusted=1')
- if PLATFORM == 'mac':
- gyp_defines.append('clang=1')
gyp_env['GYP_DEFINES'] = ' '.join(gyp_defines)
generator_flags = ['-G', 'output_dir=%s' % out_dir]
« no previous file with comments | « no previous file | native_client_sdk/src/build_tools/build_sdk.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698