summaryrefslogtreecommitdiffstats
path: root/build/SConscript.main
diff options
context:
space:
mode:
Diffstat (limited to 'build/SConscript.main')
-rw-r--r--build/SConscript.main10
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'],
)