From 99a4bfdc80eba3784f6bb1690a9d02cc7e02de72 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 7 Jun 2004 11:24:27 +0000
Subject: - fix build on gcc 3.4 - much nicer detection of wether
 $ARCH/Makefile.add modifies CFLAGS or not

---
 mdk-stage1/dietlibc/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'mdk-stage1')

diff --git a/mdk-stage1/dietlibc/Makefile b/mdk-stage1/dietlibc/Makefile
index 0fe32e61b..ec994895f 100644
--- a/mdk-stage1/dietlibc/Makefile
+++ b/mdk-stage1/dietlibc/Makefile
@@ -90,7 +90,7 @@ all: $(WHAT)
 
 profiling: $(OBJDIR)/libgmon.a $(OBJDIR)/pstart.o
 
-CFLAGS=-pipe -nostdinc
+CFLAGS=-pipe -nostdinc -fno-builtin
 CROSS=
 
 CC=gcc
@@ -117,11 +117,12 @@ LIBPTHREAD_OBJS=$(patsubst libpthread/%.c,$(OBJDIR)/%.o,$(shell ./threadsafe.sh)
 
 LIBGMON_OBJS=$(OBJDIR)/__mcount.o $(OBJDIR)/monitor.o $(OBJDIR)/profil.o
 
+ORIG_CFLAGS := $(CFLAGS)
 include $(ARCH)/Makefile.add
 
 LIBMATHOBJ=$(patsubst %,$(OBJDIR)/%,$(LIBMATH))
 
-ifeq ($(CFLAGS),-pipe -nostdinc)
+ifeq ($(CFLAGS),$(ORIG_CFLAGS))
 CFLAGS+=-O -fomit-frame-pointer
 endif
 
-- 
cgit v1.2.1