diff options
| author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-31 21:32:20 +0000 |
|---|---|---|
| committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-31 21:32:20 +0000 |
| commit | 14d15d4d94826de272025415192e9f9edaf733c1 (patch) | |
| tree | 67a34aa679a42bfae84f9792f43b863128ca2243 /chrome/SConstruct | |
| parent | bdad42a47f2dfa5783554844d54337454256a0a3 (diff) | |
| download | chromium_src-14d15d4d94826de272025415192e9f9edaf733c1.zip chromium_src-14d15d4d94826de272025415192e9f9edaf733c1.tar.gz chromium_src-14d15d4d94826de272025415192e9f9edaf733c1.tar.bz2 | |
Get SCons building Windows again without having to Import()/re-Export(): use the $PLATFORM construction variable supplied in the construction environment instead of passing around our own PLATFORM variable in Python.
R=keunwoo,evanm
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/SConstruct')
| -rw-r--r-- | chrome/SConstruct | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/chrome/SConstruct b/chrome/SConstruct index f8ea244..60245b9 100644 --- a/chrome/SConstruct +++ b/chrome/SConstruct @@ -29,23 +29,12 @@ build_component = 'chrome'
-# TODO(keunwoo): This is an ugly hack to reify the result of scons's built-in
-# platform detection as a variable (the RES attribute is only available
-# under MSWindows). Once rspangler+sgk merge better idioms into Chrome's
-# site scons, we should be able to remove this.
-try:
- Environment().RES
-except AttributeError:
- PLATFORM = 'LINUX'
-else:
- PLATFORM = 'WINDOWS'
-
# TODO(keunwoo): Merge ../build/SConscript.main.linux back to SConscript.main,
# then remove this.
-if PLATFORM == 'LINUX':
+if Environment()['PLATFORM'] == 'posix':
SCONSCRIPT_MAIN = '../build/SConscript.main.linux'
else:
SCONSCRIPT_MAIN = '../build/SConscript.main'
SConscript(SCONSCRIPT_MAIN,
- exports=['build_component', 'PLATFORM'])
+ exports=['build_component'])
|