Skip to content

Commit 7714d52

Browse files
yichoiyichoi
committed
mk: cleanup - lib and executable suffix handling
1 parent 49c3f9f commit 7714d52

File tree

15 files changed

+450
-405
lines changed

15 files changed

+450
-405
lines changed

‎Makefile.in

Lines changed: 82 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -130,44 +130,6 @@ else
130130
CFG_VALGRIND_COMPILE :=
131131
endif
132132

133-
define LIBREQ
134-
135-
CFG_RUNTIME_$(1) :=$(call CFG_LIB_NAME_$(1),rustrt)
136-
CFG_RUSTLLVM_$(1) :=$(call CFG_LIB_NAME_$(1),rustllvm)
137-
CFG_CORELIB_$(1) :=$(call CFG_LIB_NAME_$(1),core)
138-
CFG_STDLIB_$(1) :=$(call CFG_LIB_NAME_$(1),std)
139-
CFG_LIBRUSTC_$(1) :=$(call CFG_LIB_NAME_$(1),rustc)
140-
CFG_LIBSYNTAX_$(1) :=$(call CFG_LIB_NAME_$(1),syntax)
141-
CFG_LIBFUZZER_$(1) :=$(call CFG_LIB_NAME_$(1),fuzzer)
142-
CFG_LIBRUSTPKG_$(1) :=$(call CFG_LIB_NAME_$(1),rustpkg)
143-
CFG_LIBRUSTDOC_$(1) :=$(call CFG_LIB_NAME_$(1),rustdoc)
144-
CFG_LIBRUSTI_$(1) :=$(call CFG_LIB_NAME_$(1),rusti)
145-
CFG_LIBRUST_$(1) :=$(call CFG_LIB_NAME_$(1),rust)
146-
147-
STDLIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),std)
148-
CORELIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),core)
149-
LIBRUSTC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustc)
150-
LIBSYNTAX_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),syntax)
151-
LIBFUZZER_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),fuzzer)
152-
LIBRUSTPKG_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustpkg)
153-
LIBRUSTDOC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustdoc)
154-
LIBRUSTI_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rusti)
155-
LIBRUST_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rust)
156-
STDLIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),std)
157-
CORELIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),core)
158-
LIBRUSTC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustc)
159-
LIBSYNTAX_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),syntax)
160-
LIBFUZZER_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),fuzzer)
161-
LIBRUSTPKG_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustpkg)
162-
LIBRUSTDOC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustdoc)
163-
LIBRUSTI_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rusti)
164-
LIBRUST_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rust)
165-
166-
endef
167-
168-
$(foreach target,$(CFG_TARGET_TRIPLES), \
169-
$(eval $(call LIBREQ,$(target))))
170-
171133
# version-string calculation
172134
CFG_GIT_DIR := $(CFG_SRC_DIR).git
173135
CFG_RELEASE = 0.6
@@ -197,16 +159,21 @@ endif
197159
# Target-and-rule "utility variables"
198160
######################################################################
199161

200-
#ifdef VERBOSE
162+
ifdef VERBOSE
201163
Q :=
202164
E =
203-
#else
204-
# Q := @
205-
# E = echo $(1)
206-
#endif
165+
else
166+
Q := @
167+
E = echo $(1)
168+
endif
207169

208170
S := $(CFG_SRC_DIR)
209-
X := $(CFG_EXE_SUFFIX)
171+
172+
define DEF_X
173+
X_$(1) := $(CFG_EXE_SUFFIX_$(1))
174+
endef
175+
$(foreach target,$(CFG_TARGET_TRIPLES),\
176+
$(eval $(call DEF_X,$(target))))
210177

211178
# Look in doc and src dirs.
212179
VPATH := $(S)doc $(S)src
@@ -222,6 +189,49 @@ GENERATED :=
222189
%:: s.%
223190
%:: SCCS/s.%
224191

192+
193+
######################################################################
194+
# Crates
195+
######################################################################
196+
197+
define DEF_LIBS
198+
199+
CFG_RUNTIME_$(1) :=$(call CFG_LIB_NAME_$(1),rustrt)
200+
CFG_RUSTLLVM_$(1) :=$(call CFG_LIB_NAME_$(1),rustllvm)
201+
CFG_CORELIB_$(1) :=$(call CFG_LIB_NAME_$(1),core)
202+
CFG_STDLIB_$(1) :=$(call CFG_LIB_NAME_$(1),std)
203+
CFG_LIBRUSTC_$(1) :=$(call CFG_LIB_NAME_$(1),rustc)
204+
CFG_LIBSYNTAX_$(1) :=$(call CFG_LIB_NAME_$(1),syntax)
205+
CFG_LIBFUZZER_$(1) :=$(call CFG_LIB_NAME_$(1),fuzzer)
206+
CFG_LIBRUSTPKG_$(1) :=$(call CFG_LIB_NAME_$(1),rustpkg)
207+
CFG_LIBRUSTDOC_$(1) :=$(call CFG_LIB_NAME_$(1),rustdoc)
208+
CFG_LIBRUSTI_$(1) :=$(call CFG_LIB_NAME_$(1),rusti)
209+
CFG_LIBRUST_$(1) :=$(call CFG_LIB_NAME_$(1),rust)
210+
211+
STDLIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),std)
212+
CORELIB_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),core)
213+
LIBRUSTC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustc)
214+
LIBSYNTAX_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),syntax)
215+
LIBFUZZER_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),fuzzer)
216+
LIBRUSTPKG_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustpkg)
217+
LIBRUSTDOC_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rustdoc)
218+
LIBRUSTI_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rusti)
219+
LIBRUST_GLOB_$(1) :=$(call CFG_LIB_GLOB_$(1),rust)
220+
STDLIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),std)
221+
CORELIB_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),core)
222+
LIBRUSTC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustc)
223+
LIBSYNTAX_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),syntax)
224+
LIBFUZZER_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),fuzzer)
225+
LIBRUSTPKG_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustpkg)
226+
LIBRUSTDOC_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rustdoc)
227+
LIBRUSTI_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rusti)
228+
LIBRUST_DSYM_GLOB_$(1) :=$(call CFG_LIB_DSYM_GLOB_$(1),rust)
229+
230+
endef
231+
232+
$(foreach target,$(CFG_TARGET_TRIPLES),\
233+
$(eval $(call DEF_LIBS,$(target))))
234+
225235
######################################################################
226236
# Core library variables
227237
######################################################################
@@ -267,8 +277,8 @@ CFG_LLVM_BUILD_DIR_$(1):=$$(CFG_LLVM_BUILD_DIR_$(subst -,_,$(1)))
267277
CFG_LLVM_INST_DIR_$(1):=$$(CFG_LLVM_INST_DIR_$(subst -,_,$(1)))
268278

269279
# Any rules that depend on LLVM should depend on LLVM_CONFIG
270-
LLVM_CONFIG_$(1):=$$(CFG_LLVM_INST_DIR_$(1))/bin/llvm-config$$(X)
271-
LLVM_MC_$(1):=$$(CFG_LLVM_INST_DIR_$(1))/bin/llvm-mc$$(X)
280+
LLVM_CONFIG_$(1):=$$(CFG_LLVM_INST_DIR_$(1))/bin/llvm-config$$(X_$(1))
281+
LLVM_MC_$(1):=$$(CFG_LLVM_INST_DIR_$(1))/bin/llvm-mc$$(X_$(1))
272282
LLVM_VERSION_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --version)
273283
LLVM_BINDIR_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --bindir)
274284
LLVM_INCDIR_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --includedir)
@@ -280,8 +290,8 @@ LLVM_LDFLAGS_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --ldflags)
280290
LLVM_CXXFLAGS_$(1)=$$(subst -I, -iquote , $$(shell "$$(LLVM_CONFIG_$(1))" --cxxflags))
281291
LLVM_HOST_TRIPLE_$(1)=$$(shell "$$(LLVM_CONFIG_$(1))" --host-target)
282292

283-
LLVM_AS_$(1)=$$(CFG_LLVM_INST_DIR_$(1))/bin/llvm-as$$(X)
284-
LLC_$(1)=$$(CFG_LLVM_INST_DIR_$(1))/bin/llc$$(X)
293+
LLVM_AS_$(1)=$$(CFG_LLVM_INST_DIR_$(1))/bin/llvm-as$$(X_$(1))
294+
LLC_$(1)=$$(CFG_LLVM_INST_DIR_$(1))/bin/llc$$(X_$(1))
285295

286296
endef
287297

@@ -357,12 +367,12 @@ else
357367
HLIBRUSTC_DEFAULT$(1)_H_$(3) = \
358368
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTC_$(3))
359369
TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3) = \
360-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3))
370+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2))
361371
endif
362372

363373
# Preqrequisites for using the stageN compiler
364374
HSREQ$(1)_H_$(3) = \
365-
$$(HBIN$(1)_H_$(3))/rustc$$(X) \
375+
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
366376
$$(HLIB$(1)_H_$(3))/$(CFG_RUNTIME_$(3)) \
367377
$$(HLIB$(1)_H_$(3))/$(CFG_RUSTLLVM_$(3)) \
368378
$$(HCORELIB_DEFAULT$(1)_H_$(3)) \
@@ -386,25 +396,25 @@ SREQ$(1)_T_$(2)_H_$(3) = \
386396
# Prerequisites for a working stageN compiler and libraries, for a specific target
387397
CSREQ$(1)_T_$(2)_H_$(3) = \
388398
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
389-
$$(HBIN$(1)_H_$(3))/fuzzer$$(X) \
390-
$$(HBIN$(1)_H_$(3))/rustpkg$$(X) \
391-
$$(HBIN$(1)_H_$(3))/rustdoc$$(X) \
392-
$$(HBIN$(1)_H_$(3))/rusti$$(X) \
393-
$$(HBIN$(1)_H_$(3))/rust$$(X) \
399+
$$(HBIN$(1)_H_$(3))/fuzzer$$(X_$(3)) \
400+
$$(HBIN$(1)_H_$(3))/rustpkg$$(X_$(3)) \
401+
$$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) \
402+
$$(HBIN$(1)_H_$(3))/rusti$$(X_$(3)) \
403+
$$(HBIN$(1)_H_$(3))/rust$$(X_$(3)) \
394404
$$(HLIB$(1)_H_$(3))/$(CFG_LIBFUZZER_$(3)) \
395405
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTPKG_$(3)) \
396406
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTDOC_$(3)) \
397407
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTI_$(3)) \
398408
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUST_$(3)) \
399-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB_$(3)) \
400-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(3)) \
401-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(3)) \
402-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)) \
403-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBFUZZER_$(3)) \
404-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTPKG_$(3)) \
405-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC_$(3)) \
406-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTI_$(3)) \
407-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUST_$(3))
409+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB_$(2)) \
410+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)) \
411+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(2)) \
412+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2)) \
413+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBFUZZER_$(2)) \
414+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTPKG_$(2)) \
415+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC_$(2)) \
416+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTI_$(2)) \
417+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUST_$(2))
408418

409419
ifeq ($(1),0)
410420
# Don't run the the stage0 compiler under valgrind - that ship has sailed
@@ -428,18 +438,20 @@ endif
428438
endif
429439

430440
STAGE$(1)_T_$(2)_H_$(3) := \
431-
$$(Q)$$(call CFG_RUN_TARG,$(1), \
441+
$$(Q)$$(call CFG_RUN_TARG_$(3),$(1), \
432442
$$(CFG_VALGRIND_COMPILE$(1)) \
433-
$$(HBIN$(1)_H_$(3))/rustc$$(X) \
443+
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
434444
--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \
435-
$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2))
445+
$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2)) \
446+
$$(RUSTC_FLAGS_$(2))
436447

437448
PERF_STAGE$(1)_T_$(2)_H_$(3) := \
438-
$$(Q)$$(call CFG_RUN_TARG,$(1), \
449+
$$(Q)$$(call CFG_RUN_TARG_$(3),$(1), \
439450
$$(CFG_PERF_TOOL) \
440-
$$(HBIN$(1)_H_$(3))/rustc$$(X) \
451+
$$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
441452
--cfg $$(CFGFLAG$(1)_T_$(2)_H_$(3)) \
442-
$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2))
453+
$$(CFG_RUSTC_FLAGS) $$(EXTRAFLAGS_STAGE$(1)) --target=$(2)) \
454+
$$(RUSTC_FLAGS_$(2))
443455

444456
endef
445457

‎configure

Lines changed: 39 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,8 @@ valopt llvm-root "" "set LLVM root"
349349
valopt build-triple "${DEFAULT_BUILD_TRIPLE}" "LLVM build triple"
350350
valopt host-triples "${CFG_BUILD_TRIPLE}" "LLVM host triples"
351351
valopt target-triples "${CFG_HOST_TRIPLES}" "LLVM target triples"
352-
valopt android-ndk-path "" "Android NDK Standalone path"
352+
valopt android-cross-path "/opt/ndk_standalone" "Android NDK standalone path"
353+
valopt mingw32-cross-path "" "MinGW32 cross compiler path"
353354

354355
# Validate Options
355356
step_msg "validating $CFG_SELF args"
@@ -530,29 +531,44 @@ else
530531
CFG_C_COMPILER="gcc"
531532
fi
532533

533-
if [ ! -z "$CFG_ANDROID_NDK_PATH" ]
534-
then
535-
if [ ! -f $CFG_ANDROID_NDK_PATH/bin/arm-linux-androideabi-gcc ]
536-
then
537-
err "NDK $CFG_ANDROID_NDK_PATH/bin/arm-linux-androideabi-gcc not found"
538-
fi
539-
if [ ! -f $CFG_ANDROID_NDK_PATH/bin/arm-linux-androideabi-g++ ]
540-
then
541-
err "NDK $CFG_ANDROID_NDK_PATH/bin/arm-linux-androideabi-g++ not found"
542-
fi
543-
if [ ! -f $CFG_ANDROID_NDK_PATH/bin/arm-linux-androideabi-ar ]
544-
then
545-
err "NDK $CFG_ANDROID_NDK_PATH/bin/arm-linux-androideabi-ar not found"
546-
fi
547-
548-
CFG_CROSS_PREFIX_arm=$CFG_ANDROID_NDK_PATH"/bin/arm-linux-androideabi-"
549-
fi
550-
551534
# a little post-processing of various config values
552535

553536
CFG_PREFIX=${CFG_PREFIX%/}
554537
CFG_TARGET_TRIPLES="$(echo $CFG_TARGET_TRIPLES | tr ',' ' ')"
555538

539+
# copy host-triples to target-triples so that hosts are a subset of targets
540+
V_TEMP=""
541+
for i in $CFG_HOST_TRIPLES $CFG_TARGET_TRIPLES;
542+
do
543+
echo "$V_TEMP" | grep -qF $i || V_TEMP="$V_TEMP${V_TEMP:+ }$i"
544+
done
545+
CFG_TARGET_TRIPLES=$V_TEMP
546+
547+
# check target-specific tool-chains
548+
for i in $CFG_TARGET_TRIPLES
549+
do
550+
case $i in
551+
arm-unknown-android)
552+
553+
if [ ! -f $CFG_ANDROID_CROSS_PATH/bin/arm-linux-androideabi-gcc ]
554+
then
555+
err "NDK $CFG_ANDROID_CROSS_PATH/bin/arm-linux-androideabi-gcc not found"
556+
fi
557+
if [ ! -f $CFG_ANDROID_CROSS_PATH/bin/arm-linux-androideabi-g++ ]
558+
then
559+
err "NDK $CFG_ANDROID_CROSS_PATH/bin/arm-linux-androideabi-g++ not found"
560+
fi
561+
if [ ! -f $CFG_ANDROID_CROSS_PATH/bin/arm-linux-androideabi-ar ]
562+
then
563+
err "NDK $CFG_ANDROID_CROSS_PATH/bin/arm-linux-androideabi-ar not found"
564+
fi
565+
;;
566+
567+
*)
568+
;;
569+
esac
570+
done
571+
556572
if [ -z "$CFG_ENABLE_CLANG" -a -z "$CFG_GCC" ]
557573
then
558574
err "either clang or gcc is required"
@@ -595,14 +611,15 @@ do
595611
make_dir rt/$t
596612
for i in \
597613
isaac linenoise sync test arch/i386 arch/x86_64 arch/arm \
598-
libuv libuv/src
614+
libuv libuv/src/ares libuv/src/eio libuv/src/ev
599615
do
600616
make_dir rt/$t/$i
601617
done
602618
done
603619

604620
# On windows we just store the libraries in the bin directory because
605621
# there's no rpath
622+
# FIXME: Thise needs to parameterized over target triples. Do it in platform.mk
606623
CFG_LIBDIR=lib
607624
if [ "$CFG_OSTYPE" = "pc-mingw32" ]
608625
then
@@ -841,7 +858,8 @@ putvar CFG_TARGET_TRIPLES
841858
putvar CFG_C_COMPILER
842859
putvar CFG_LIBDIR
843860
putvar CFG_DISABLE_MANAGE_SUBMODULES
844-
putvar CFG_CROSS_PREFIX_arm
861+
putvar CFG_ANDROID_CROSS_PATH
862+
putvar CFG_MINGW32_CROSS_PATH
845863

846864
if [ ! -z "$CFG_ENABLE_PAX_FLAGS" ]
847865
then

‎mk/clean.mk

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,13 @@ clean-misc:
6262
define CLEAN_HOST_STAGE_N
6363

6464
clean$(1)_H_$(2):
65-
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustc$(X)
66-
$(Q)rm -f $$(HBIN$(1)_H_$(2))/fuzzer$(X)
67-
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustpkg$(X)
68-
$(Q)rm -f $$(HBIN$(1)_H_$(2))/serializer$(X)
69-
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustdoc$(X)
70-
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rusti$(X)
71-
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rust$(X)
65+
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustc$(X_$(2))
66+
$(Q)rm -f $$(HBIN$(1)_H_$(2))/fuzzer$(X_$(2))
67+
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustpkg$(X_$(2))
68+
$(Q)rm -f $$(HBIN$(1)_H_$(2))/serializer$(X_$(2))
69+
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustdoc$(X_$(2))
70+
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rusti$(X_$(2))
71+
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rust$(X_$(2))
7272
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBFUZZER_$(2))
7373
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTPKG_$(2))
7474
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTDOC_$(2))
@@ -100,11 +100,13 @@ $(foreach host, $(CFG_HOST_TRIPLES), \
100100
define CLEAN_TARGET_STAGE_N
101101

102102
clean$(1)_T_$(2)_H_$(3):
103-
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustc$(X)
104-
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/fuzzer$(X)
105-
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustpkg$(X)
106-
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/serializer$(X)
107-
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustdoc$(X)
103+
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustc$(X_$(2))
104+
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/fuzzer$(X_$(2))
105+
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustpkg$(X_$(2))
106+
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/serializer$(X_$(2))
107+
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustdoc$(X_$(2))
108+
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rusti$(X_$(2))
109+
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rust$(X_$(2))
108110
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBFUZZER_$(2))
109111
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTPKG_$(2))
110112
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC_$(2))
@@ -113,13 +115,17 @@ clean$(1)_T_$(2)_H_$(3):
113115
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2))
114116
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2))
115117
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(2))
118+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTI_$(2))
119+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUST_$(2))
116120
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CORELIB_GLOB_$(2))
117121
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(STDLIB_GLOB_$(2))
118122
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTC_GLOB_$(2))
119123
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBSYNTAX_GLOB_$(2))
120124
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBFUZZER_GLOB_$(2))
121125
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTPKG_GLOB_$(2))
122126
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTDOC_GLOB_$(2))
127+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTI_GLOB_$(2))
128+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUST_GLOB_$(2))
123129
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(2))
124130
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libstd.rlib
125131
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a

‎mk/docs.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ ifeq ($(CFG_PANDOC),)
171171
else
172172

173173
# The rustdoc executable
174-
RUSTDOC = $(HBIN2_H_$(CFG_BUILD_TRIPLE))/rustdoc$(X)
174+
RUSTDOC = $(HBIN2_H_$(CFG_BUILD_TRIPLE))/rustdoc$(X_$(CFG_BUILD_TRIPLE))
175175

176176
# The library documenting macro
177177
# $(1) - The output directory

0 commit comments

Comments
 (0)