diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-03-01 10:39:46 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-03-01 10:39:46 +0000 |
| commit | 99dfff5e689f4edcf8710b7d958e3139f1154ba5 (patch) | |
| tree | 01ea2dd489a2bc06a87d7d11a203e86ff25704d8 | |
| parent | 81f11f697644e335434093917c1330aa844a9f27 (diff) | |
| download | upstream-99dfff5e689f4edcf8710b7d958e3139f1154ba5.tar.gz upstream-99dfff5e689f4edcf8710b7d958e3139f1154ba5.tar.bz2 upstream-99dfff5e689f4edcf8710b7d958e3139f1154ba5.zip | |
build: add TARGET_CXXFLAGS and EXTRA_CXXFLAGS, defaulting to *_CFLAGS via lazy evaluation. this allows adding c++ specific cflags
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30760 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/package-defaults.mk | 6 | ||||
| -rw-r--r-- | rules.mk | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/include/package-defaults.mk b/include/package-defaults.mk index 491e401f8c..3068d2b69b 100644 --- a/include/package-defaults.mk +++ b/include/package-defaults.mk @@ -55,6 +55,8 @@ ifneq ($(strip $(PKG_UNPACK)),) endef endif +EXTRA_CXXFLAGS = $(EXTRA_CFLAGS) + CONFIGURE_PREFIX:=/usr CONFIGURE_ARGS = \ --target=$(GNU_TARGET_NAME) \ @@ -79,7 +81,7 @@ CONFIGURE_ARGS = \ CONFIGURE_VARS = \ $(TARGET_CONFIGURE_OPTS) \ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ - CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ + CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CFLAGS)" \ CPPFLAGS="$(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \ @@ -104,7 +106,7 @@ endef MAKE_VARS = \ CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ - CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ + CXXFLAGS="$(TARGET_CXXFLAGS) $(EXTRA_CXXFLAGS) $(TARGET_CPPFLAGS) $(EXTRA_CPPFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" MAKE_FLAGS = \ @@ -108,6 +108,7 @@ BUILD_LOG_DIR:=$(TOPDIR)/logs TARGET_PATH:=$(STAGING_DIR_HOST)/bin:$(subst $(space),:,$(filter-out .,$(filter-out ./,$(subst :,$(space),$(PATH))))) TARGET_CFLAGS:=$(TARGET_OPTIMIZATION)$(if $(CONFIG_DEBUG), -g3) +TARGET_CXXFLAGS = $(TARGET_CFLAGS) TARGET_CPPFLAGS:=-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include TARGET_LDFLAGS:=-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib ifneq ($(CONFIG_EXTERNAL_TOOLCHAIN),) |