diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-01-21 02:14:50 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-01-21 02:14:50 +0000 |
| commit | bbe1e39616ea9682e2bff423a994f386fca0e617 (patch) | |
| tree | 3f88e11967b39bce0c74ab7e8d541a2325fec523 /include | |
| parent | 7082dce3c68d7ced81caccd694a6a4edf1587c32 (diff) | |
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 dd70128c8..51daa8604 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 |