diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2016-05-01 10:40:01 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2016-05-05 09:12:24 -0700 |
| commit | 39eec8071c5b2920203c1ba98943efe2b1007e62 (patch) | |
| tree | 4230564fa04e17ae06058852b62e6754fd47e6fd | |
| parent | 3f65afa6946ee4a6b1d619aee69e1f638edfb662 (diff) | |
| download | rust-39eec8071c5b2920203c1ba98943efe2b1007e62.tar.gz rust-39eec8071c5b2920203c1ba98943efe2b1007e62.zip | |
mk: Fix building with --enable-ccache
We will no longer use `ccache` in the makefiles for our local dependencies like miniz, but they're so small anyway it doesn't really matter. Closes #33285
| -rw-r--r-- | mk/platform.mk | 6 | ||||
| -rw-r--r-- | mk/tests.mk | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/mk/platform.mk b/mk/platform.mk index 59c8f7726c9..c2644621c57 100644 --- a/mk/platform.mk +++ b/mk/platform.mk @@ -169,7 +169,7 @@ ifdef CFG_CCACHE_BASEDIR export CCACHE_BASEDIR endif -FIND_COMPILER = $(word 1,$(1:ccache=)) +FIND_COMPILER = $(strip $(1:ccache=)) define CFG_MAKE_TOOLCHAIN # Prepend the tools with their prefix if cross compiling @@ -187,7 +187,7 @@ define CFG_MAKE_TOOLCHAIN endif endif - CFG_COMPILE_C_$(1) = '$$(CC_$(1))' \ + CFG_COMPILE_C_$(1) = '$$(call FIND_COMPILER,$$(CC_$(1)))' \ $$(CFLAGS) \ $$(CFG_GCCISH_CFLAGS) \ $$(CFG_GCCISH_CFLAGS_$(1)) \ @@ -198,7 +198,7 @@ define CFG_MAKE_TOOLCHAIN $$(CFG_GCCISH_LINK_FLAGS_$(1)) \ $$(CFG_GCCISH_DEF_FLAG_$(1))$$(3) $$(2) \ $$(call CFG_INSTALL_NAME_$(1),$$(4)) - CFG_COMPILE_CXX_$(1) = '$$(CXX_$(1))' \ + CFG_COMPILE_CXX_$(1) = '$$(call FIND_COMPILER,$$(CXX_$(1)))' \ $$(CXXFLAGS) \ $$(CFG_GCCISH_CFLAGS) \ $$(CFG_GCCISH_CXXFLAGS) \ diff --git a/mk/tests.mk b/mk/tests.mk index 90a7888af09..f2f3290ba68 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -636,8 +636,8 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \ --host-rustcflags "$(RUSTC_FLAGS_$(3)) $$(CTEST_RUSTC_FLAGS) -L $$(RT_OUTPUT_DIR_$(3))" \ --lldb-python-dir=$(CFG_LLDB_PYTHON_DIR) \ --target-rustcflags "$(RUSTC_FLAGS_$(2)) $$(CTEST_RUSTC_FLAGS) -L $$(RT_OUTPUT_DIR_$(2))" \ - --cc '$$(CC_$(2))' \ - --cxx '$$(CXX_$(2))' \ + --cc '$$(call FIND_COMPILER,$$(CC_$(2)))' \ + --cxx '$$(call FIND_COMPILER,$$(CXX_$(2)))' \ --cflags "$$(CFG_GCCISH_CFLAGS_$(2))" \ --llvm-components "$$(LLVM_ALL_COMPONENTS_$(2))" \ --llvm-cxxflags "$$(LLVM_CXXFLAGS_$(2))" \ |