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

Unified Diff: SConstruct

Issue 1613004: Issue a warning if naclsdk_mode=manual is specified with ARM. (Closed) Base URL: http://nativeclient.googlecode.com/svn/trunk/src/native_client/
Patch Set: '' Created 10 years, 9 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 | tools/llvm/llvm-fake.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: SConstruct
===================================================================
--- SConstruct (revision 1957)
+++ SConstruct (working copy)
@@ -301,11 +301,14 @@
# Source setup bash scripts and glean the settings.
if (pre_base_env['TARGET_ARCHITECTURE'] == 'arm' and
- not ARGUMENTS.get('built_elsewhere') and
- ARGUMENTS.get('naclsdk_mode') != 'manual'):
- FixupArmEnvironment()
+ not ARGUMENTS.get('built_elsewhere')):
+ if ARGUMENTS.get('naclsdk_mode') != 'manual':
+ FixupArmEnvironment()
+ else:
+ print >>sys.stderr, (
+ "You must not specify naclsdk_mode=manual for ARM (any more).")
+ sys.exit(1);
-
# ----------------------------------------------------------
# PLUGIN PREREQUISITES
# ----------------------------------------------------------
« no previous file with comments | « no previous file | tools/llvm/llvm-fake.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698