Commit ffada369ee029e199a222b43869f0e81b1b5cb3f
Committed by
Anthony Liguori
Anthony Liguori
1 parent
92b458e8
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>
Showing
4 changed files
with
8 additions
and
10 deletions
Makefile
| ... | ... | @@ -17,8 +17,8 @@ endif |
| 17 | 17 | VPATH=$(SRC_PATH):$(SRC_PATH)/hw |
| 18 | 18 | |
| 19 | 19 | |
| 20 | -CFLAGS += $(OS_CFLAGS) $(ARCH_CFLAGS) | |
| 21 | -LDFLAGS += $(OS_LDFLAGS) $(ARCH_LDFLAGS) | |
| 20 | +CFLAGS += $(ARCH_CFLAGS) | |
| 21 | +LDFLAGS += $(ARCH_LDFLAGS) | |
| 22 | 22 | |
| 23 | 23 | CPPFLAGS += -I. -I$(SRC_PATH) -MMD -MP -MT $@ |
| 24 | 24 | CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE | ... | ... |
Makefile.hw
| ... | ... | @@ -8,8 +8,8 @@ include $(SRC_PATH)/rules.mak |
| 8 | 8 | |
| 9 | 9 | VPATH=$(SRC_PATH):$(SRC_PATH)/hw |
| 10 | 10 | |
| 11 | -CFLAGS += $(OS_CFLAGS) $(ARCH_CFLAGS) | |
| 12 | -LDFLAGS += $(OS_LDFLAGS) $(ARCH_LDFLAGS) | |
| 11 | +CFLAGS += $(ARCH_CFLAGS) | |
| 12 | +LDFLAGS += $(ARCH_LDFLAGS) | |
| 13 | 13 | |
| 14 | 14 | CPPFLAGS += -I. -I.. -I$(SRC_PATH) -MMD -MP -MT $@ |
| 15 | 15 | CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE | ... | ... |
Makefile.target
| ... | ... | @@ -60,8 +60,8 @@ ifeq ($(ARCH),ia64) |
| 60 | 60 | CFLAGS+=-mno-sdata |
| 61 | 61 | endif |
| 62 | 62 | |
| 63 | -CFLAGS+=$(OS_CFLAGS) $(ARCH_CFLAGS) | |
| 64 | -LDFLAGS+=$(OS_LDFLAGS) $(ARCH_LDFLAGS) | |
| 63 | +CFLAGS+= $(ARCH_CFLAGS) | |
| 64 | +LDFLAGS+= $(ARCH_LDFLAGS) | |
| 65 | 65 | |
| 66 | 66 | CPPFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE |
| 67 | 67 | CPPFLAGS+=-U_FORTIFY_SOURCE | ... | ... |
configure
| ... | ... | @@ -1492,12 +1492,10 @@ echo "LD=$ld" >> $config_mak |
| 1492 | 1492 | # XXX: only use CFLAGS and LDFLAGS ? |
| 1493 | 1493 | # XXX: should export HOST_CFLAGS and HOST_LDFLAGS for cross |
| 1494 | 1494 | # compilation of dyngen tool (useful for win32 build on Linux host) |
| 1495 | -echo "OS_CFLAGS=$OS_CFLAGS" >> $config_mak | |
| 1496 | -echo "OS_LDFLAGS=$OS_LDFLAGS" >> $config_mak | |
| 1497 | 1495 | echo "ARCH_CFLAGS=$ARCH_CFLAGS" >> $config_mak |
| 1498 | 1496 | echo "ARCH_LDFLAGS=$ARCH_LDFLAGS" >> $config_mak |
| 1499 | -echo "CFLAGS=$CFLAGS $EXTRA_CFLAGS" >> $config_mak | |
| 1500 | -echo "LDFLAGS=$LDFLAGS $EXTRA_LDFLAGS" >> $config_mak | |
| 1497 | +echo "CFLAGS=$CFLAGS $OS_CFLAGS $EXTRA_CFLAGS" >> $config_mak | |
| 1498 | +echo "LDFLAGS=$LDFLAGS $OS_LDFLAGS $EXTRA_LDFLAGS" >> $config_mak | |
| 1501 | 1499 | echo "EXESUF=$EXESUF" >> $config_mak |
| 1502 | 1500 | echo "PTHREADLIBS=$PTHREADLIBS" >> $config_mak |
| 1503 | 1501 | echo "CLOCKLIBS=$CLOCKLIBS" >> $config_mak | ... | ... |