From deb2200671d5b4856ca27d4286253db0d9e12a32 Mon Sep 17 00:00:00 2001 From: Andreas Hansson Date: Sat, 27 Sep 2014 09:08:34 -0400 Subject: scons: Address issues related to gcc 4.9.1 Fix a number few minor issues to please gcc 4.9.1. Removing the '-fuse-linker-plugin' flag means no libraries are part of the LTO process, but hopefully this is an acceptable loss, as the flag causes issues on a lot of systems (only certain combinations of gcc, ld and ar work). --- SConstruct | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'SConstruct') diff --git a/SConstruct b/SConstruct index 138df137f..883a52718 100755 --- a/SConstruct +++ b/SConstruct @@ -602,14 +602,12 @@ if main['GCC']: if not GetOption('no_lto'): # Pass the LTO flag when compiling to produce GIMPLE # output, we merely create the flags here and only append - # them later/ + # them later main['LTO_CCFLAGS'] = ['-flto=%d' % GetOption('num_jobs')] # Use the same amount of jobs for LTO as we are running - # scons with, we hardcode the use of the linker plugin - # which requires either gold or GNU ld >= 2.21 - main['LTO_LDFLAGS'] = ['-flto=%d' % GetOption('num_jobs'), - '-fuse-linker-plugin'] + # scons with + main['LTO_LDFLAGS'] = ['-flto=%d' % GetOption('num_jobs')] main.Append(TCMALLOC_CCFLAGS=['-fno-builtin-malloc', '-fno-builtin-calloc', '-fno-builtin-realloc', '-fno-builtin-free']) -- cgit v1.2.3