We can wrap OS_CFLAGS/OS_LDFLAGS in CFLAGS/LDFLAGS at configure time

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

diff --git a/Makefile b/Makefile
index 0ffe7edb4ba065950e9c12bf82b705b0f85de5ae..d5a8ac0a167effce3d3f231a3476e1f446593ff2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,8 +17,8 @@ endif
 VPATH=$(SRC_PATH):$(SRC_PATH)/hw
 
 
-CFLAGS += $(OS_CFLAGS) $(ARCH_CFLAGS)
-LDFLAGS += $(OS_LDFLAGS) $(ARCH_LDFLAGS)
+CFLAGS +=  $(ARCH_CFLAGS)
+LDFLAGS +=  $(ARCH_LDFLAGS)
 
 CPPFLAGS += -I. -I$(SRC_PATH) -MMD -MP -MT $@
 CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE

diff --git a/Makefile.hw b/Makefile.hw
index 571e5184f7ebccf8465672fb3ddcb376b102b452..e11dea1b3da1f31f61884492e0e992c769c89ebb 100644 (file)
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -8,8 +8,8 @@ include $(SRC_PATH)/rules.mak
 
 VPATH=$(SRC_PATH):$(SRC_PATH)/hw
 
-CFLAGS += $(OS_CFLAGS) $(ARCH_CFLAGS)
-LDFLAGS += $(OS_LDFLAGS) $(ARCH_LDFLAGS)
+CFLAGS += $(ARCH_CFLAGS)
+LDFLAGS += $(ARCH_LDFLAGS)
 
 CPPFLAGS += -I. -I.. -I$(SRC_PATH) -MMD -MP -MT $@
 CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE

diff --git a/Makefile.target b/Makefile.target
index a250c5d33f07d72ae4bbd1884d97d0dbd5fefb1a..df7c0d501c4d171545e7e13513b2bb46245850b0 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -60,8 +60,8 @@ ifeq ($(ARCH),ia64)
 CFLAGS+=-mno-sdata
 endif
 
-CFLAGS+=$(OS_CFLAGS) $(ARCH_CFLAGS)
-LDFLAGS+=$(OS_LDFLAGS) $(ARCH_LDFLAGS)
+CFLAGS+= $(ARCH_CFLAGS)
+LDFLAGS+= $(ARCH_LDFLAGS)
 
 CPPFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 CPPFLAGS+=-U_FORTIFY_SOURCE

diff --git a/configure b/configure
index e21aa86bbaee39d60f5adea20519ff64575ec290..95ed3d0726683c192c60d8919b21b6330605dde2 100755 (executable)
--- a/configure
+++ b/configure
@@ -1492,12 +1492,10 @@ echo "LD=$ld" >> $config_mak
 # XXX: only use CFLAGS and LDFLAGS ?  
 # XXX: should export HOST_CFLAGS and HOST_LDFLAGS for cross
 # compilation of dyngen tool (useful for win32 build on Linux host)
-echo "OS_CFLAGS=$OS_CFLAGS" >> $config_mak
-echo "OS_LDFLAGS=$OS_LDFLAGS" >> $config_mak
 echo "ARCH_CFLAGS=$ARCH_CFLAGS" >> $config_mak
 echo "ARCH_LDFLAGS=$ARCH_LDFLAGS" >> $config_mak
-echo "CFLAGS=$CFLAGS $EXTRA_CFLAGS" >> $config_mak
-echo "LDFLAGS=$LDFLAGS $EXTRA_LDFLAGS" >> $config_mak
+echo "CFLAGS=$CFLAGS $OS_CFLAGS $EXTRA_CFLAGS" >> $config_mak
+echo "LDFLAGS=$LDFLAGS $OS_LDFLAGS $EXTRA_LDFLAGS" >> $config_mak
 echo "EXESUF=$EXESUF" >> $config_mak
 echo "PTHREADLIBS=$PTHREADLIBS" >> $config_mak
 echo "CLOCKLIBS=$CLOCKLIBS" >> $config_mak