aboutsummaryrefslogtreecommitdiff
path: root/package/Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'package/Makefile.in')
-rw-r--r--package/Makefile.in12
1 files changed, 11 insertions, 1 deletions
diff --git a/package/Makefile.in b/package/Makefile.in
index d7a817d8d7..1589cf14b9 100644
--- a/package/Makefile.in
+++ b/package/Makefile.in
@@ -60,11 +60,13 @@ ifeq ($(BR2_SOFT_FLOAT),y)
TARGET_CFLAGS+=-msoft-float
endif
+TARGET_CXXFLAGS=$(TARGET_CFLAGS)
# else it's an external toolchain
#########################################################################
else
TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include -I$(TOOLCHAIN_EXTERNAL_PATH)/$(TOOLCHAIN_EXTERNAL_PREFIX)/include
+TARGET_CXXFLAGS=$(TARGET_CFLAGS)
TARGET_LDFLAGS=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib
endif
#########################################################################
@@ -130,6 +132,7 @@ TARGET_CROSS=$(TOOLCHAIN_EXTERNAL_PATH)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)-
endif
TARGET_CC=$(TARGET_CROSS)gcc
TARGET_CXX=$(TARGET_CROSS)g++
+TARGET_AR=$(TARGET_CROSS)ar
TARGET_RANLIB=$(TARGET_CROSS)ranlib
TARGET_LDCONFIG=$(TARGET_CROSS)ldconfig
INSTALL=/usr/bin/install
@@ -175,9 +178,14 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
CXX_FOR_BUILD="$(HOSTCXX)" \
LD_FOR_BUILD="$(HOSTLD)" \
CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
+ CXXFLAGS_FOR_BUILD="$(HOST_CXXFLAGS)" \
LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \
PKG_CONFIG_SYSROOT="$(STAGING_DIR)" \
- PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config"
+ PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" \
+ PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
+ PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \
+ PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \
+ STAGING_DIR="$(STAGING_DIR)"
HOST_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
AR_FOR_BUILD="$(HOSTAR)" \
@@ -265,3 +273,5 @@ ifeq ($(strip $(BR2_PACKAGE_XGGI)),y)
XSERVER+=xggi
endif
+include package/Makefile.autotools.in
+