diff options
| author | John Crispin <blogic@openwrt.org> | 2012-06-18 08:50:26 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2012-06-18 08:50:26 +0000 |
| commit | 37b25592de08ff47e53bf1a775b79643d0cce7f3 (patch) | |
| tree | 18b28adcd65ee4573a2f5b940789bdc1baf37147 | |
| parent | 75a137d38bd701a4062789e7a59b173d20db6928 (diff) | |
| download | upstream-37b25592de08ff47e53bf1a775b79643d0cce7f3.tar.gz upstream-37b25592de08ff47e53bf1a775b79643d0cce7f3.tar.bz2 upstream-37b25592de08ff47e53bf1a775b79643d0cce7f3.zip | |
[uclibc++] fix ccache related build breakage
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32421 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | include/uclibc++.mk | 4 | ||||
| -rw-r--r-- | package/uclibc++/Makefile | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/uclibc++.mk b/include/uclibc++.mk index 084ba6aab1..a1a61f26d4 100644 --- a/include/uclibc++.mk +++ b/include/uclibc++.mk @@ -9,8 +9,8 @@ CXX_DEPENDS = +USE_UCLIBCXX:uclibcxx +USE_LIBSTDCXX:libstdcpp ifneq ($(CONFIG_USE_UCLIBCXX),) ifneq ($(CONFIG_CCACHE),) - TARGET_CXX_NOCACHE="g++-uc" + TARGET_CXX_NOCACHE=g++-uc else - TARGET_CXX="g++-uc" + TARGET_CXX=g++-uc endif endif diff --git a/package/uclibc++/Makefile b/package/uclibc++/Makefile index b73e8bdd80..ac5032b55d 100644 --- a/package/uclibc++/Makefile +++ b/package/uclibc++/Makefile @@ -45,6 +45,10 @@ UCLIBC_TARGET_ARCH:=$(shell echo $(ARCH) | sed -e s'/-.*//' \ TARGET_CFLAGS += $(FPIC) +ifneq ($(CONFIG_CCACHE),) +TARGET_CXX=$(TARGET_CXX_NOCACHE) +endif + MAKE_FLAGS:= \ TOPDIR="$(PKG_BUILD_DIR)/" \ $(TARGET_CONFIGURE_OPTS) \ |