diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-01-21 02:14:50 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-01-21 02:14:50 +0000 |
| commit | d6db09f812da2dccf6214e5094ba8b8ab45ad1f6 (patch) | |
| tree | 3f88e11967b39bce0c74ab7e8d541a2325fec523 /include | |
| parent | 1e61d2ea710628c8fca3544e7f60c4f4b14d8f65 (diff) | |
| download | master-187ad058-d6db09f812da2dccf6214e5094ba8b8ab45ad1f6.tar.gz master-187ad058-d6db09f812da2dccf6214e5094ba8b8ab45ad1f6.tar.bz2 master-187ad058-d6db09f812da2dccf6214e5094ba8b8ab45ad1f6.zip | |
pass the CFLAGS through the environment on compile and fix a few packages
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6154 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'include')
| -rw-r--r-- | include/package.mk | 6 |
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 |