aboutsummaryrefslogtreecommitdiff
path: root/package/Makefile.in
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-06-25 23:26:04 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2010-07-07 08:14:41 +0200
commite721a7c07e0a9ab4a6a8fe7aff9f378ac4144df6 (patch)
tree676209106c916a1f9c2e1bbf6803e309a5a9029c /package/Makefile.in
parent26082e79af64550d16fb1e314a904456b90a464e (diff)
downloadbuildroot-e721a7c07e0a9ab4a6a8fe7aff9f378ac4144df6.tar.gz
buildroot-e721a7c07e0a9ab4a6a8fe7aff9f378ac4144df6.tar.bz2
Merge TARGET_CONFIGURE_ENV into TARGET_CONFIGURE_OPTS
TARGET_CONFIGURE_ENV defines CFLAGS, LDFLAGS, CXXFLAGS and FCFLAGS, separatly from all other variables that are part of TARGET_CONFIGURE_OPTS. This is useless and not consistent with the HOST_CONFIGURE_ variables, therefore we merge TARGET_CONFIGURE_ENV into TARGET_CONFIGURE_OPTS and fix the few users of TARGET_CONFIGURE_ENV. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/Makefile.in')
-rw-r--r--package/Makefile.in10
1 files changed, 4 insertions, 6 deletions
diff --git a/package/Makefile.in b/package/Makefile.in
index 1c965c9cf4..189806d7ba 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -194,18 +194,16 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
FCFLAGS_FOR_BUILD="$(HOST_FCFLAGS)" \
DEFAULT_ASSEMBLER="$(TARGET_AS)" \
DEFAULT_LINKER="$(TARGET_LD)" \
+ CFLAGS="$(TARGET_CFLAGS)" \
+ CXXFLAGS="$(TARGET_CXXFLAGS)" \
+ LDFLAGS="$(TARGET_LDFLAGS)" \
+ FCFLAGS="$(TARGET_FCFLAGS)" \
PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
PERLLIB="$(HOST_DIR)/usr/lib/perl" \
STAGING_DIR="$(STAGING_DIR)"
-TARGET_CONFIGURE_ENV=\
- CFLAGS="$(TARGET_CFLAGS)" \
- CXXFLAGS="$(TARGET_CXXFLAGS)" \
- LDFLAGS="$(TARGET_LDFLAGS)" \
- FCFLAGS="$(TARGET_FCFLAGS)" \
-
TARGET_MAKE_ENV=PATH=$(TARGET_PATH) \
PERLLIB="$(HOST_DIR)/usr/lib/perl"