summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
Diffstat (limited to 'build')
-rw-r--r--build/SConscript.v84
-rw-r--r--build/debug.scons2
-rw-r--r--build/external_code.scons2
-rw-r--r--build/googleurl_lib.scons2
-rw-r--r--build/googleurl_unittests.scons2
-rw-r--r--build/internal/essential.scons6
-rw-r--r--build/internal/release_impl_dom_stats.scons2
7 files changed, 10 insertions, 10 deletions
diff --git a/build/SConscript.v8 b/build/SConscript.v8
index c22fb57..49c2085 100644
--- a/build/SConscript.v8
+++ b/build/SConscript.v8
@@ -56,7 +56,7 @@ v8_scons_targets_on = [
'$V8_MODE_DIR/snapshot${OBJSUFFIX}',
]
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
v8_scons_targets_off.extend([
env.File('$V8_DIR/vc80.pdb')
])
@@ -79,7 +79,7 @@ env.Install('$LIBS_DIR', v8[1])
env.Install('$V8_DIR', '$V8_MODE_DIR/snapshot-empty${OBJSUFFIX}')
# To satisfy tests expecting the following .exe name.
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
# TODO(evanm): this may be necessary on other platforms(?)
i = env.InstallAs('$TARGET_ROOT/v8_shell_sample${PROGSUFFIX}', v8[0])
diff --git a/build/debug.scons b/build/debug.scons
index 4cf6bf8..3b0011a 100644
--- a/build/debug.scons
+++ b/build/debug.scons
@@ -21,7 +21,7 @@ env.Append(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
if env.get('INCREMENTAL') is None:
# INCREMENTAL was not specified on the command line or in the
# external environment; debug default is incremental link.
diff --git a/build/external_code.scons b/build/external_code.scons
index 45c039f..04ee866 100644
--- a/build/external_code.scons
+++ b/build/external_code.scons
@@ -8,7 +8,7 @@ External code settings for Chromium builds.
Import("env")
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Append(
CPPDEFINES = [
'_CRT_SECURE_NO_DEPRECATE',
diff --git a/build/googleurl_lib.scons b/build/googleurl_lib.scons
index 6738fea..4d8b6d3 100644
--- a/build/googleurl_lib.scons
+++ b/build/googleurl_lib.scons
@@ -20,7 +20,7 @@ env.Prepend(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Append(
CCFLAGS = [
'/TP',
diff --git a/build/googleurl_unittests.scons b/build/googleurl_unittests.scons
index 851f85a..7cdb6f3 100644
--- a/build/googleurl_unittests.scons
+++ b/build/googleurl_unittests.scons
@@ -23,7 +23,7 @@ env.Prepend(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Append(
CCFLAGS = [
'/TP',
diff --git a/build/internal/essential.scons b/build/internal/essential.scons
index bca07f2..547f73a 100644
--- a/build/internal/essential.scons
+++ b/build/internal/essential.scons
@@ -21,7 +21,7 @@ env.Append(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
incremental = env.get('INCREMENTAL')
if incremental is not None:
if incremental:
@@ -110,7 +110,7 @@ if env['PLATFORM'] == 'win32':
'/EH', # VCCLCompilerTool.ExceptionHandling="0"
],
)
-elif env['PLATFORM'] == 'posix':
+elif env.Bit('linux'):
pass
-elif env['PLATFORM'] == 'mac':
+elif env.Bit('mac'):
pass
diff --git a/build/internal/release_impl_dom_stats.scons b/build/internal/release_impl_dom_stats.scons
index ec55585..9dae238 100644
--- a/build/internal/release_impl_dom_stats.scons
+++ b/build/internal/release_impl_dom_stats.scons
@@ -17,7 +17,7 @@ env.Append(
],
)
-if env['PLATFORM'] == 'win32':
+if env.Bit('windows'):
env.Replace(
CHROMIUM_LINK_OPT_FLAGS = [
'/OPT:REF', # VCLinkerTool.OptimizeReferences="2"