aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--Makefile.hw4
-rw-r--r--Makefile.target4
-rwxr-xr-xconfigure6
4 files changed, 8 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 0ffe7edb4b..d5a8ac0a16 100644
--- 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 571e5184f7..e11dea1b3d 100644
--- 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 a250c5d33f..df7c0d501c 100644
--- 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 e21aa86bba..95ed3d0726 100755
--- 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