NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup TARGET_CONFIGURE_OPTS

Browse Source 
The definition of CC, LD, GCC, CPP, CXX and FC shouldn't contain the
CFLAGS/LDFLAGS/CXXFLAGS, those should be passed through the
appropriate variables.

However, the --sysroot option is a particular case here: it needs to
be part of the CC/LD/GCC/etc. definitions otherwise libtool strips it
from the CFLAGS/LDFLAGS.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Thomas Petazzoni 2010-06-25 15:04:08 +02:00
parent dc67c7f4dc
commit efb1d8d3f4
1 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
package/Makefile.in
View File

@ -81,9 +81,9 @@ ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
endif endif
TARGET_LDFLAGS+=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib --sysroot=$(STAGING_DIR) TARGET_LDFLAGS+=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
TARGET_CFLAGS+=--sysroot=$(STAGING_DIR)
TARGET_CXXFLAGS=$(TARGET_CFLAGS) TARGET_CXXFLAGS=$(TARGET_CFLAGS)
TARGET_SYSROOT_OPT=--sysroot=$(STAGING_DIR)
# Compute GNU_TARGET_NAME and REAL_GNU_TARGET_NAME # Compute GNU_TARGET_NAME and REAL_GNU_TARGET_NAME
GNU_TARGET_NAME=$(ARCH)-linux GNU_TARGET_NAME=$(ARCH)-linux
@ -113,22 +113,27 @@ TOOLCHAIN_EXTERNAL_PATH:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin/:$(TOOLCHAIN_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)" TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(HOST_DIR)/usr/sbin/:$(TOOLCHAIN_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)"
TARGET_CROSS=$(TOOLCHAIN_EXTERNAL_PATH)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)- TARGET_CROSS=$(TOOLCHAIN_EXTERNAL_PATH)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)-
endif endif
# Define TARGET_xx variables for all common binutils/gcc tools by
# including the --sysroot option where necessary.
TARGET_AR = $(TARGET_CROSS)ar TARGET_AR = $(TARGET_CROSS)ar
TARGET_AS = $(TARGET_CROSS)as TARGET_AS = $(TARGET_CROSS)as
TARGET_CC=$(TARGET_CROSS)gcc TARGET_CC = $(TARGET_CROSS)gcc $(TARGET_SYSROOT_OPT)
TARGET_CPP=$(TARGET_CROSS)cpp TARGET_CPP = $(TARGET_CROSS)cpp $(TARGET_SYSROOT_OPT)
TARGET_CXX=$(TARGET_CROSS)g++ TARGET_CXX = $(TARGET_CROSS)g++ $(TARGET_SYSROOT_OPT)
TARGET_FC=$(TARGET_CROSS)gfortran TARGET_FC = $(TARGET_CROSS)gfortran $(TARGET_SYSROOT_OPT)
TARGET_LD=$(TARGET_CROSS)ld TARGET_LD = $(TARGET_CROSS)ld $(TARGET_SYSROOT_OPT)
TARGET_NM = $(TARGET_CROSS)nm TARGET_NM = $(TARGET_CROSS)nm
TARGET_RANLIB = $(TARGET_CROSS)ranlib TARGET_RANLIB = $(TARGET_CROSS)ranlib
TARGET_OBJCOPY = $(TARGET_CROSS)objcopy TARGET_OBJCOPY = $(TARGET_CROSS)objcopy
TARGET_OBJDUMP = $(TARGET_CROSS)objdump TARGET_OBJDUMP = $(TARGET_CROSS)objdump
ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y)
TARGET_LDCONFIG = $(TARGET_CROSS)ldconfig TARGET_LDCONFIG = $(TARGET_CROSS)ldconfig
else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) else ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y)
TARGET_LDCONFIG = /sbin/ldconfig TARGET_LDCONFIG = /sbin/ldconfig
endif endif
ifeq ($(BR2_STRIP_strip),y) ifeq ($(BR2_STRIP_strip),y)
STRIP_DISCARD_ALL:=--discard-all STRIP_DISCARD_ALL:=--discard-all
STRIP_STRIP_UNNEEDED:=--strip-unneeded STRIP_STRIP_UNNEEDED:=--strip-unneeded
@ -169,11 +174,11 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
AS="$(TARGET_AS)" \ AS="$(TARGET_AS)" \
LD="$(TARGET_LD)" \ LD="$(TARGET_LD)" \
NM="$(TARGET_NM)" \ NM="$(TARGET_NM)" \
CC="$(TARGET_CC) $(TARGET_CFLAGS)" \ CC="$(TARGET_CC)" \
GCC="$(TARGET_CC) $(TARGET_CFLAGS)" \ GCC="$(TARGET_CC)" \
CPP="$(TARGET_CPP) $(TARGET_CFLAGS)" \ CPP="$(TARGET_CPP)" \
CXX="$(TARGET_CXX) $(TARGET_CXXFLAGS)" \ CXX="$(TARGET_CXX)" \
FC="$(TARGET_FC) $(TARGET_FCFLAGS)" \ FC="$(TARGET_FC)" \
RANLIB="$(TARGET_RANLIB)" \ RANLIB="$(TARGET_RANLIB)" \
STRIP="$(TARGET_STRIP)" \ STRIP="$(TARGET_STRIP)" \
OBJCOPY="$(TARGET_OBJCOPY)" \ OBJCOPY="$(TARGET_OBJCOPY)" \