diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-09-24 02:09:45 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-09-24 02:09:45 +0000 |
| commit | aafb639ffe5e68e42244b36361fbc2434ea1ce27 (patch) | |
| tree | 28753cb5d4a81673cd55603bdec208fda5bfc087 | |
| parent | 3b520eb3c5d08b77c42baedc91d02fe81e695f40 (diff) | |
add CXXFLAGS and PKG_CONFIG_PATH in Build/Configure/Default,
add EXTRA_LDFLAGS in Build/Compile/Default,
use consistent search order for includes in CFLAGS.
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4849 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/package.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/package.mk b/include/package.mk index 396fae60f8..f7dbacc415 100644 --- a/include/package.mk +++ b/include/package.mk @@ -271,12 +271,14 @@ define Build/Prepare endef define Build/Configure/Default - @(cd $(PKG_BUILD_DIR)/$(3); \ + (cd $(PKG_BUILD_DIR)/$(3); \ if [ -x configure ]; then \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS)" \ + 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" \ $(2) \ ./configure \ --target=$(GNU_TARGET_NAME) \ @@ -308,7 +310,8 @@ define Build/Compile/Default $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ CROSS="$(TARGET_CROSS)" \ - EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include" \ + EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include " \ + EXTRA_LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib " \ ARCH="$(ARCH)" \ $(1); endef |