diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-13 20:11:17 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-13 20:11:17 +0000 |
| commit | 2ea7103247c84dd233a5a5b40660ed65a7bd4417 (patch) | |
| tree | 1569cec75bff5ece6967c511f713188fe02f233d /build/SConscript.main | |
| parent | 1a772600e633d8b8f324c3b505efb45dd3b7bdd9 (diff) | |
| download | chromium_src-2ea7103247c84dd233a5a5b40660ed65a7bd4417.zip chromium_src-2ea7103247c84dd233a5a5b40660ed65a7bd4417.tar.gz chromium_src-2ea7103247c84dd233a5a5b40660ed65a7bd4417.tar.bz2 | |
Add extra pass throughs for enforge.
Add march flag to builds. Our system compilers are assuming > i386 already, but
not all gcc installations will do this. Without an march flag, gcc assumes only
a 386 and then some atomic operations are compiled to undefined references
which break linking.
Review URL: http://codereview.chromium.org/10689
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5363 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/SConscript.main')
| -rw-r--r-- | build/SConscript.main | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/build/SConscript.main b/build/SConscript.main index 60e86a9..cccbd6a 100644 --- a/build/SConscript.main +++ b/build/SConscript.main @@ -458,13 +458,15 @@ linux_env.FilterOut(CPPDEFINES = ['OS_LINUX=OS_LINUX']) # Copy some environment variables from the outer environment to the # SCons.Environment if they exist. -for envvar in ('CC', 'CXX'): +for envvar in ('CC', 'CXX', 'LINK'): if envvar in os.environ: linux_env[envvar] = os.environ[envvar] # Copy these environment variables from the outer environment to the # environment that the build commands run in. # $HOME is needed by distcc so it can find its lock file. -for envvar in ('HOME', 'DISTCC_DIR', 'DISTCC_HOSTS', 'CCACHE_DIR'): +for envvar in ('HOME', 'DISTCC_DIR', 'DISTCC_HOSTS', 'CCACHE_DIR', + 'INTERCEPTOR_SOCKET', 'ENFORGE_DIGEST_CACHE', + 'ENFORGE_CACHE_HOST', 'ENFORGE_CACHE_PORT'): if envvar in os.environ: linux_env['ENV'][envvar] = os.environ[envvar] @@ -478,8 +480,8 @@ linux_env.Append( BUILD_SCONSCRIPTS = [ '$LIBEVENT_DIR/libevent.scons', ], - CCFLAGS = ['-m32', '-pthread'], - CXXFLAGS = ['-Wall', '-Werror'] + excluded_warnings, + CCFLAGS = ['-m32', '-pthread', '-march=i686'], + CXXFLAGS = ['-Wall', '-Werror', '-march=i686'] + excluded_warnings, LINKFLAGS = ['-m32', '-pthread'], ) |