File tree 2 files changed +5
-5
lines changed
2 files changed +5
-5
lines changed Original file line number Diff line number Diff line change @@ -169,7 +169,7 @@ ifdef CFG_CCACHE_BASEDIR
169
169
export CCACHE_BASEDIR
170
170
endif
171
171
172
- FIND_COMPILER = $(word 1, $(1:ccache= ) )
172
+ FIND_COMPILER = $(strip $(1:ccache= ) )
173
173
174
174
define CFG_MAKE_TOOLCHAIN
175
175
# Prepend the tools with their prefix if cross compiling
@@ -187,7 +187,7 @@ define CFG_MAKE_TOOLCHAIN
187
187
endif
188
188
endif
189
189
190
- CFG_COMPILE_C_$(1 ) = '$$(CC_$(1 ) ) ' \
190
+ CFG_COMPILE_C_$(1 ) = '$$(call FIND_COMPILER, $$( CC_$(1 ) ) ) ' \
191
191
$$(CFLAGS ) \
192
192
$$(CFG_GCCISH_CFLAGS ) \
193
193
$$(CFG_GCCISH_CFLAGS_$(1 ) ) \
@@ -198,7 +198,7 @@ define CFG_MAKE_TOOLCHAIN
198
198
$$(CFG_GCCISH_LINK_FLAGS_$(1 ) ) \
199
199
$$(CFG_GCCISH_DEF_FLAG_$(1 ) )$$(3 ) $$(2 ) \
200
200
$$(call CFG_INSTALL_NAME_$(1 ) ,$$(4 ) )
201
- CFG_COMPILE_CXX_$(1 ) = '$$(CXX_$(1 ) ) ' \
201
+ CFG_COMPILE_CXX_$(1 ) = '$$(call FIND_COMPILER, $$( CXX_$(1 ) ) ) ' \
202
202
$$(CXXFLAGS ) \
203
203
$$(CFG_GCCISH_CFLAGS ) \
204
204
$$(CFG_GCCISH_CXXFLAGS ) \
Original file line number Diff line number Diff line change @@ -636,8 +636,8 @@ CTEST_COMMON_ARGS$(1)-T-$(2)-H-$(3) := \
636
636
--host-rustcflags "$(RUSTC_FLAGS_$(3 ) ) $$(CTEST_RUSTC_FLAGS ) -L $$(RT_OUTPUT_DIR_$(3 ) ) " \
637
637
--lldb-python-dir=$(CFG_LLDB_PYTHON_DIR ) \
638
638
--target-rustcflags "$(RUSTC_FLAGS_$(2 ) ) $$(CTEST_RUSTC_FLAGS ) -L $$(RT_OUTPUT_DIR_$(2 ) ) " \
639
- --cc '$$(CC_$(2 ) ) ' \
640
- --cxx '$$(CXX_$(2 ) ) ' \
639
+ --cc '$$(call FIND_COMPILER, $$( CC_$(2 ) ) ) ' \
640
+ --cxx '$$(call FIND_COMPILER, $$( CXX_$(2 ) ) ) ' \
641
641
--cflags "$$(CFG_GCCISH_CFLAGS_$(2 ) ) " \
642
642
--llvm-components "$$(LLVM_ALL_COMPONENTS_$(2 ) ) " \
643
643
--llvm-cxxflags "$$(LLVM_CXXFLAGS_$(2 ) ) " \
You can’t perform that action at this time.
0 commit comments