X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/d9e08935208c29b8ed3cd63ba52e77c3c25bcf8f..103e8ec36641ab269573afc206864ef12f2677e6:/include/package.mk?ds=sidebyside

diff --git a/include/package.mk b/include/package.mk
index 8f751a1b1..389ee5b6b 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -303,12 +303,14 @@ CONFIGURE_ARGS := \
 		--infodir=/usr/info \
 		$(DISABLE_NLS)
 
+TARGET_CPPFLAGS=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include
+TARGET_LDFLAGS=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
 CONFIGURE_VARS:= \
 		$(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" \
+		CPPFLAGS="$(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
 		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" \
 		PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig"
 
@@ -331,8 +333,8 @@ define Build/Configure
 endef
 
 MAKE_VARS := \
-	CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS) " \
-	CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS) " \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	CXXFLAGS="$(TARGET_CFLAGS) " \
 	LDFLAGS="$(EXTRA_LDFLAGS) "
 
 MAKE_FLAGS := \