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>
This commit is contained in:
parent
ffada369ee
commit
d80438aad5
4
Makefile
4
Makefile
@ -16,10 +16,6 @@ endif
|
|||||||
|
|
||||||
VPATH=$(SRC_PATH):$(SRC_PATH)/hw
|
VPATH=$(SRC_PATH):$(SRC_PATH)/hw
|
||||||
|
|
||||||
|
|
||||||
CFLAGS += $(ARCH_CFLAGS)
|
|
||||||
LDFLAGS += $(ARCH_LDFLAGS)
|
|
||||||
|
|
||||||
CPPFLAGS += -I. -I$(SRC_PATH) -MMD -MP -MT $@
|
CPPFLAGS += -I. -I$(SRC_PATH) -MMD -MP -MT $@
|
||||||
CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
|
CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
|
||||||
CPPFLAGS += -U_FORTIFY_SOURCE
|
CPPFLAGS += -U_FORTIFY_SOURCE
|
||||||
|
@ -8,9 +8,6 @@ include $(SRC_PATH)/rules.mak
|
|||||||
|
|
||||||
VPATH=$(SRC_PATH):$(SRC_PATH)/hw
|
VPATH=$(SRC_PATH):$(SRC_PATH)/hw
|
||||||
|
|
||||||
CFLAGS += $(ARCH_CFLAGS)
|
|
||||||
LDFLAGS += $(ARCH_LDFLAGS)
|
|
||||||
|
|
||||||
CPPFLAGS += -I. -I.. -I$(SRC_PATH) -MMD -MP -MT $@
|
CPPFLAGS += -I. -I.. -I$(SRC_PATH) -MMD -MP -MT $@
|
||||||
CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
|
CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
|
||||||
CPPFLAGS+=-I$(SRC_PATH)/fpu
|
CPPFLAGS+=-I$(SRC_PATH)/fpu
|
||||||
|
@ -60,9 +60,6 @@ ifeq ($(ARCH),ia64)
|
|||||||
CFLAGS+=-mno-sdata
|
CFLAGS+=-mno-sdata
|
||||||
endif
|
endif
|
||||||
|
|
||||||
CFLAGS+= $(ARCH_CFLAGS)
|
|
||||||
LDFLAGS+= $(ARCH_LDFLAGS)
|
|
||||||
|
|
||||||
CPPFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
|
CPPFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
|
||||||
CPPFLAGS+=-U_FORTIFY_SOURCE
|
CPPFLAGS+=-U_FORTIFY_SOURCE
|
||||||
LIBS+=-lm
|
LIBS+=-lm
|
||||||
|
9
configure
vendored
9
configure
vendored
@ -1489,13 +1489,8 @@ echo "HOST_CC=$host_cc" >> $config_mak
|
|||||||
echo "AR=$ar" >> $config_mak
|
echo "AR=$ar" >> $config_mak
|
||||||
echo "OBJCOPY=$objcopy" >> $config_mak
|
echo "OBJCOPY=$objcopy" >> $config_mak
|
||||||
echo "LD=$ld" >> $config_mak
|
echo "LD=$ld" >> $config_mak
|
||||||
# XXX: only use CFLAGS and LDFLAGS ?
|
echo "CFLAGS=$CFLAGS $OS_CFLAGS $ARCH_CFLAGS $EXTRA_CFLAGS" >> $config_mak
|
||||||
# XXX: should export HOST_CFLAGS and HOST_LDFLAGS for cross
|
echo "LDFLAGS=$LDFLAGS $OS_LDFLAGS $ARCH_LDFLAGS $EXTRA_LDFLAGS" >> $config_mak
|
||||||
# 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 "EXESUF=$EXESUF" >> $config_mak
|
echo "EXESUF=$EXESUF" >> $config_mak
|
||||||
echo "PTHREADLIBS=$PTHREADLIBS" >> $config_mak
|
echo "PTHREADLIBS=$PTHREADLIBS" >> $config_mak
|
||||||
echo "CLOCKLIBS=$CLOCKLIBS" >> $config_mak
|
echo "CLOCKLIBS=$CLOCKLIBS" >> $config_mak
|
||||||
|
Loading…
Reference in New Issue
Block a user