From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Fri, 23 Dec 2016 11:45:24 +0100 Subject: [PATCH] Use RPM_OPT_FLAGS for the natively-built parts --- SCons/Config/gnu | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/SCons/Config/gnu b/SCons/Config/gnu index 2562b95..8e166b2 100755 --- a/SCons/Config/gnu +++ b/SCons/Config/gnu @@ -1,5 +1,7 @@ print "Using GNU tools configuration" +import os + Import('defenv') ### imports @@ -114,6 +116,7 @@ makensis_env.Append(CPPPATH = ['#$BUILD_CONFIG']) if not defenv['DEBUG']: makensis_env.Append(CCFLAGS = ['-O2']) # optimize + makensis_env.Append(CCFLAGS = os.getenv('RPM_OPT_FLAGS')) # optimize makensis_env.Append(CFLAGS = ['-Wall']) # all warnings makensis_env.Append(CXXFLAGS = ['-Wno-non-virtual-dtor']) # ignore virtual dtor warnings makensis_env.Append(CXXFLAGS = ['-Wall']) # all warnings @@ -190,6 +193,7 @@ conf.Finish() ### cross-platform util environment adjustments +cp_util_env.Append(CCFLAGS = os.getenv('RPM_OPT_FLAGS')) conf = FlagsConfigure(cp_util_env) if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_CP']: TestStrip(conf) # strip