From: Phil Blundell <philb@gnu.org>
Date: Mon, 2 Aug 2004 16:47:56 +0000 (+0000)
Subject: Merge bk://openembedded@openembedded.bkbits.net/packages
X-Git-Tag: Release-2010-05/1~17864
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15923d1915961199290a8b72b9b76466ad0a7ef0;p=openembedded.git

Merge bk://openembedded@openembedded.bkbits.net/packages
into stealth.(none):/home/pb/oe/oe-packages

2004/08/02 17:47:45+01:00 (none)!pb
use different CFLAGS for build machine to avoid depending on new gcc

BKrev: 410e703c6q8URPBgQEeZkxGz2wmvBg
---

diff --git a/conf/oe.conf b/conf/oe.conf
index 115a5fd3f9..daee332520 100644
--- a/conf/oe.conf
+++ b/conf/oe.conf
@@ -276,6 +276,7 @@ ALLOWED_FLAGS = "-O -mcpu -march -pipe"
 FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
 DEBUG_OPTIMIZATION = "-O -g"
 SELECTED_OPTIMIZATION := "${@oe.data.getVar(['FULL_OPTIMIZATION', 'DEBUG_OPTIMIZATION'][oe.data.getVar('DEBUG_BUILD', d, 1) == '1'], d, 1)}"
+BUILD_OPTIMIZATION = "-O2"
 # XXX unused?
 OPTIMIZATION = "-O2"
 
@@ -284,7 +285,7 @@ export BUILD_CPPFLAGS = "-I${STAGING_DIR}/${BUILD_SYS}/include"
 export CPPFLAGS = "${TARGET_CPPFLAGS}"
 export TARGET_CPPFLAGS = "-I${STAGING_DIR}/${TARGET_SYS}/include"
 
-export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${SELECTED_OPTIMIZATION}"
+export BUILD_CFLAGS = "${BUILD_CPPFLAGS} ${BUILD_OPTIMIZATION}"
 export CFLAGS = "${TARGET_CFLAGS}"
 export TARGET_CFLAGS = "${TARGET_CPPFLAGS} ${SELECTED_OPTIMIZATION}"