summaryrefslogtreecommitdiff
path: root/recipes/zlib
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-07-24 22:28:22 -0400
committerChris Larson <chris_larson@mentor.com>2010-07-25 10:02:50 -0700
commitda26c362b6b32d52f755ca55bfc6cc0f9ddb42f6 (patch)
tree4bf6a6a588baba78acd7d2be1b71bc54cf69d884 /recipes/zlib
parent8df384ecb006741bdb891ad82d6ee24fa5be38bb (diff)
Work around ncurses-sdk & zlib-sdk build failures on CentOS 5.4
The issue here is that we're building ncurses with HOST==BUILD!=TARGET, aka 'cross', yet we're applying a CFLAGS override based on the target, not the host, which results in passing -fforward-propagate to the build machine's gcc, which isn't supported in older versions. Signed-off-by: Chris Larson <chris_larson@mentor.com>
Diffstat (limited to 'recipes/zlib')
-rw-r--r--recipes/zlib/zlib.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/recipes/zlib/zlib.inc b/recipes/zlib/zlib.inc
index 5b00ccf6e0..5c00acbd3e 100644
--- a/recipes/zlib/zlib.inc
+++ b/recipes/zlib/zlib.inc
@@ -8,8 +8,10 @@ INC_PR ="r7"
# Below option is added to overcome the GCC bug on ARM
# see http://gcc.gnu.org/PR42981 for further details.
# We could potentially take it off when its fixed in gcc 4.5
-
-CFLAGS_append_arm = " -fforward-propagate "
+CFLAGS += "${CFLAGS_EXTRA}"
+CFLAGS_EXTRA_append_arm = " -fforward-propagate"
+CFLAGS_EXTRA_virtclass-native = ""
+CFLAGS_EXTRA_virtclass-sdk = ""
BBCLASSEXTEND = "native sdk"