aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-07-16 18:34:07 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-07-16 17:28:56 -0500
commitd80438aad5b1ef6e11c7b5003665331cb68f193c (patch)
tree3d9127c6561df1ed305ad447ac44596272200236
parentffada369ee029e199a222b43869f0e81b1b5cb3f (diff)
We can wrap ARCH_CFLAGS/ARCH_LDFLAGS in CFLAGS/LDFLAGS at configure time
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rw-r--r--Makefile4
-rw-r--r--Makefile.hw3
-rw-r--r--Makefile.target3
-rwxr-xr-xconfigure9
4 files changed, 2 insertions, 17 deletions
diff --git a/Makefile b/Makefile
index d5a8ac0a16..dc95869d4f 100644
--- a/Makefile
+++ b/Makefile
@@ -16,10 +16,6 @@ endif
VPATH=$(SRC_PATH):$(SRC_PATH)/hw
-
-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
CPPFLAGS += -U_FORTIFY_SOURCE
diff --git a/Makefile.hw b/Makefile.hw
index e11dea1b3d..17c73df84f 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -8,9 +8,6 @@ include $(SRC_PATH)/rules.mak
VPATH=$(SRC_PATH):$(SRC_PATH)/hw
-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
CPPFLAGS+=-I$(SRC_PATH)/fpu
diff --git a/Makefile.target b/Makefile.target
index df7c0d501c..6883c44771 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -60,9 +60,6 @@ ifeq ($(ARCH),ia64)
CFLAGS+=-mno-sdata
endif
-CFLAGS+= $(ARCH_CFLAGS)
-LDFLAGS+= $(ARCH_LDFLAGS)
-
CPPFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
CPPFLAGS+=-U_FORTIFY_SOURCE
LIBS+=-lm
diff --git a/configure b/configure
index 95ed3d0726..416e53274a 100755
--- a/configure
+++ b/configure
@@ -1489,13 +1489,8 @@ echo "HOST_CC=$host_cc" >> $config_mak
echo "AR=$ar" >> $config_mak
echo "OBJCOPY=$objcopy" >> $config_mak
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 "ARCH_CFLAGS=$ARCH_CFLAGS" >> $config_mak
-echo "ARCH_LDFLAGS=$ARCH_LDFLAGS" >> $config_mak
-echo "CFLAGS=$CFLAGS $OS_CFLAGS $EXTRA_CFLAGS" >> $config_mak
-echo "LDFLAGS=$LDFLAGS $OS_LDFLAGS $EXTRA_LDFLAGS" >> $config_mak
+echo "CFLAGS=$CFLAGS $OS_CFLAGS $ARCH_CFLAGS $EXTRA_CFLAGS" >> $config_mak
+echo "LDFLAGS=$LDFLAGS $OS_LDFLAGS $ARCH_LDFLAGS $EXTRA_LDFLAGS" >> $config_mak
echo "EXESUF=$EXESUF" >> $config_mak
echo "PTHREADLIBS=$PTHREADLIBS" >> $config_mak
echo "CLOCKLIBS=$CLOCKLIBS" >> $config_mak