From: John Crispin Date: Mon, 18 Jun 2012 08:50:26 +0000 (+0000) Subject: fix ccache related build breakage X-Git-Tag: v19.07.0-rc1~24224 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0a684babcc49a61a631f61d293543c4c53d193b4;p=openwrt%2Fstaging%2Fhauke.git fix ccache related build breakage SVN-Revision: 32421 --- 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) \