aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2007-01-21 02:14:50 +0000
committerFelix Fietkau <nbd@openwrt.org>2007-01-21 02:14:50 +0000
commit3133fefe06562d0ce7984230425128634de27f2f (patch)
tree8df13d10fa44e4a5f514430f10185173143cee39 /include
parent69d76bb482633a1f0af1dc635a3286062e0397cf (diff)
downloadupstream-3133fefe06562d0ce7984230425128634de27f2f.tar.gz
upstream-3133fefe06562d0ce7984230425128634de27f2f.tar.bz2
upstream-3133fefe06562d0ce7984230425128634de27f2f.zip
pass the CFLAGS through the environment on compile and fix a few packages
SVN-Revision: 6154
Diffstat (limited to 'include')
-rw-r--r--include/package.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/package.mk b/include/package.mk
index dd70128c8f..51daa86044 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -293,6 +293,7 @@ define Build/Configure/Default
CXXFLAGS="$(TARGET_CFLAGS)" \
CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \
$(2) \
$(PKG_CONFIG_PATH)/configure \
@@ -322,11 +323,12 @@ define Build/Configure
endef
define Build/Compile/Default
+ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS) " \
+ LDFLAGS="$(EXTRA_LDFLAGS) " \
$(MAKE) -C $(PKG_BUILD_DIR) \
$(TARGET_CONFIGURE_OPTS) \
CROSS="$(TARGET_CROSS)" \
- EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include " \
- EXTRA_LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib " \
+ CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS) " \
ARCH="$(ARCH)" \
$(1);
endef