diff options
author | John Crispin <john@openwrt.org> | 2012-06-18 08:50:26 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2012-06-18 08:50:26 +0000 |
commit | 0a684babcc49a61a631f61d293543c4c53d193b4 (patch) | |
tree | a3b0dead74cf21a376db628f9e07c34361872a11 | |
parent | 33600679329458db7a0d258f3985daa52d98bf75 (diff) | |
download | upstream-0a684babcc49a61a631f61d293543c4c53d193b4.tar.gz upstream-0a684babcc49a61a631f61d293543c4c53d193b4.tar.bz2 upstream-0a684babcc49a61a631f61d293543c4c53d193b4.zip |
fix ccache related build breakage
SVN-Revision: 32421
-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) \ |