Skip to content

Commit 26a5dc5

Browse files
yichoiyichoi
committed
mk: rewrite make files
1 parent d96b483 commit 26a5dc5

File tree

12 files changed

+397
-343
lines changed

12 files changed

+397
-343
lines changed

‎Makefile.in

Lines changed: 67 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -130,36 +130,43 @@ else
130130
CFG_VALGRIND_COMPILE :=
131131
endif
132132

133-
CFG_RUNTIME :=$(call CFG_LIB_NAME,rustrt)
134-
CFG_RUSTLLVM :=$(call CFG_LIB_NAME,rustllvm)
135-
CFG_CORELIB :=$(call CFG_LIB_NAME,core)
136-
CFG_STDLIB :=$(call CFG_LIB_NAME,std)
137-
CFG_LIBRUSTC :=$(call CFG_LIB_NAME,rustc)
138-
CFG_LIBSYNTAX :=$(call CFG_LIB_NAME,syntax)
139-
CFG_LIBFUZZER :=$(call CFG_LIB_NAME,fuzzer)
140-
CFG_LIBRUSTPKG :=$(call CFG_LIB_NAME,rustpkg)
141-
CFG_LIBRUSTDOC :=$(call CFG_LIB_NAME,rustdoc)
142-
CFG_LIBRUSTI :=$(call CFG_LIB_NAME,rusti)
143-
CFG_LIBRUST :=$(call CFG_LIB_NAME,rust)
144-
145-
STDLIB_GLOB :=$(call CFG_LIB_GLOB,std)
146-
CORELIB_GLOB :=$(call CFG_LIB_GLOB,core)
147-
LIBRUSTC_GLOB :=$(call CFG_LIB_GLOB,rustc)
148-
LIBSYNTAX_GLOB :=$(call CFG_LIB_GLOB,syntax)
149-
LIBFUZZER_GLOB :=$(call CFG_LIB_GLOB,fuzzer)
150-
LIBRUSTPKG_GLOB :=$(call CFG_LIB_GLOB,rustpkg)
151-
LIBRUSTDOC_GLOB :=$(call CFG_LIB_GLOB,rustdoc)
152-
LIBRUSTI_GLOB :=$(call CFG_LIB_GLOB,rusti)
153-
LIBRUST_GLOB :=$(call CFG_LIB_GLOB,rust)
154-
STDLIB_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,std)
155-
CORELIB_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,core)
156-
LIBRUSTC_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rustc)
157-
LIBSYNTAX_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,syntax)
158-
LIBFUZZER_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,fuzzer)
159-
LIBRUSTPKG_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rustpkg)
160-
LIBRUSTDOC_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rustdoc)
161-
LIBRUSTI_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rusti)
162-
LIBRUST_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rust)
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))))
163170

164171
# version-string calculation
165172
CFG_GIT_DIR := $(CFG_SRC_DIR).git
@@ -190,13 +197,13 @@ endif
190197
# Target-and-rule "utility variables"
191198
######################################################################
192199

193-
ifdef VERBOSE
200+
#ifdef VERBOSE
194201
Q :=
195202
E =
196-
else
197-
Q := @
198-
E = echo $(1)
199-
endif
203+
#else
204+
# Q := @
205+
# E = echo $(1)
206+
#endif
200207

201208
S := $(CFG_SRC_DIR)
202209
X := $(CFG_EXE_SUFFIX)
@@ -338,26 +345,26 @@ ifdef CFG_DISABLE_SHAREDSTD
338345
$$(TLIB$(1)_T_$(2)_H_$(3))/librustc.rlib
339346
else
340347
HCORELIB_DEFAULT$(1)_H_$(3) = \
341-
$$(HLIB$(1)_H_$(3))/$(CFG_CORELIB)
348+
$$(HLIB$(1)_H_$(3))/$(CFG_CORELIB_$(3))
342349
TCORELIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
343-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB)
350+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB_$(2))
344351

345352
HSTDLIB_DEFAULT$(1)_H_$(3) = \
346-
$$(HLIB$(1)_H_$(3))/$(CFG_STDLIB)
353+
$$(HLIB$(1)_H_$(3))/$(CFG_STDLIB_$(3))
347354
TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
348-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB)
355+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2))
349356

350357
HLIBRUSTC_DEFAULT$(1)_H_$(3) = \
351-
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTC)
358+
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTC_$(3))
352359
TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3) = \
353-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC)
360+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3))
354361
endif
355362

356363
# Preqrequisites for using the stageN compiler
357364
HSREQ$(1)_H_$(3) = \
358365
$$(HBIN$(1)_H_$(3))/rustc$$(X) \
359-
$$(HLIB$(1)_H_$(3))/$$(CFG_RUNTIME) \
360-
$$(HLIB$(1)_H_$(3))/$$(CFG_RUSTLLVM) \
366+
$$(HLIB$(1)_H_$(3))/$(CFG_RUNTIME_$(3)) \
367+
$$(HLIB$(1)_H_$(3))/$(CFG_RUSTLLVM_$(3)) \
361368
$$(HCORELIB_DEFAULT$(1)_H_$(3)) \
362369
$$(HSTDLIB_DEFAULT$(1)_H_$(3)) \
363370
$$(HLIBSYNTAX_DEFAULT$(1)_H_$(3)) \
@@ -367,14 +374,14 @@ HSREQ$(1)_H_$(3) = \
367374
# Prerequisites for using the stageN compiler to build target artifacts
368375
TSREQ$(1)_T_$(2)_H_$(3) = \
369376
$$(HSREQ$(1)_H_$(3)) \
370-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUNTIME) \
377+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUNTIME_$(2)) \
371378
$$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a
372379

373380
# Prerequisites for a working stageN compiler and libraries, for a specific target
374381
SREQ$(1)_T_$(2)_H_$(3) = \
375382
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
376-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_CORELIB) \
377-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB)
383+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB_$(2)) \
384+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2))
378385

379386
# Prerequisites for a working stageN compiler and libraries, for a specific target
380387
CSREQ$(1)_T_$(2)_H_$(3) = \
@@ -384,20 +391,20 @@ CSREQ$(1)_T_$(2)_H_$(3) = \
384391
$$(HBIN$(1)_H_$(3))/rustdoc$$(X) \
385392
$$(HBIN$(1)_H_$(3))/rusti$$(X) \
386393
$$(HBIN$(1)_H_$(3))/rust$$(X) \
387-
$$(HLIB$(1)_H_$(3))/$$(CFG_LIBFUZZER) \
388-
$$(HLIB$(1)_H_$(3))/$$(CFG_LIBRUSTPKG) \
389-
$$(HLIB$(1)_H_$(3))/$$(CFG_LIBRUSTDOC) \
390-
$$(HLIB$(1)_H_$(3))/$$(CFG_LIBRUSTI) \
391-
$$(HLIB$(1)_H_$(3))/$$(CFG_LIBRUST) \
392-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_CORELIB) \
393-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB) \
394-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX) \
395-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC) \
396-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBFUZZER) \
397-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTPKG) \
398-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTDOC) \
399-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTI) \
400-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUST)
394+
$$(HLIB$(1)_H_$(3))/$(CFG_LIBFUZZER_$(3)) \
395+
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTPKG_$(3)) \
396+
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTDOC_$(3)) \
397+
$$(HLIB$(1)_H_$(3))/$(CFG_LIBRUSTI_$(3)) \
398+
$$(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))
401408

402409
ifeq ($(1),0)
403410
# Don't run the the stage0 compiler under valgrind - that ship has sailed

‎configure

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,6 +349,7 @@ 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"
352353

353354
# Validate Options
354355
step_msg "validating $CFG_SELF args"
@@ -529,6 +530,24 @@ else
529530
CFG_C_COMPILER="gcc"
530531
fi
531532

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+
532551
# a little post-processing of various config values
533552

534553
CFG_PREFIX=${CFG_PREFIX%/}
@@ -575,7 +594,7 @@ for t in $CFG_TARGET_TRIPLES
575594
do
576595
make_dir rt/$t
577596
for i in \
578-
isaac linenoise sync test arch/i386 arch/x86_64 \
597+
isaac linenoise sync test arch/i386 arch/x86_64 arch/arm \
579598
libuv
580599
do
581600
make_dir rt/$t/$i
@@ -822,6 +841,7 @@ putvar CFG_TARGET_TRIPLES
822841
putvar CFG_C_COMPILER
823842
putvar CFG_LIBDIR
824843
putvar CFG_DISABLE_MANAGE_SUBMODULES
844+
putvar CFG_CROSS_PREFIX_arm
825845

826846
if [ ! -z "$CFG_ENABLE_PAX_FLAGS" ]
827847
then

‎mk/clean.mk

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -69,26 +69,26 @@ clean$(1)_H_$(2):
6969
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rustdoc$(X)
7070
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rusti$(X)
7171
$(Q)rm -f $$(HBIN$(1)_H_$(2))/rust$(X)
72-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBFUZZER)
73-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTPKG)
74-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTDOC)
75-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUNTIME)
76-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_CORELIB)
77-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_STDLIB)
78-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTC)
79-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBSYNTAX)
80-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTI)
81-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUST)
82-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CORELIB_GLOB)
83-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(STDLIB_GLOB)
84-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTC_GLOB)
85-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBSYNTAX_GLOB)
86-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBFUZZER_GLOB)
87-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTPKG_GLOB)
88-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTDOC_GLOB)
89-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTI_GLOB)
90-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUST_GLOB)
91-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUSTLLVM)
72+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBFUZZER_$(2))
73+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTPKG_$(2))
74+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTDOC_$(2))
75+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUNTIME_$(2))
76+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_CORELIB_$(2))
77+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_STDLIB_$(2))
78+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTC_$(2))
79+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBSYNTAX_$(2))
80+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTI_$(2))
81+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUST_$(2))
82+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CORELIB_GLOB_$(2))
83+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(STDLIB_GLOB_$(2))
84+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTC_GLOB_$(2))
85+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBSYNTAX_GLOB_$(2))
86+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBFUZZER_GLOB_$(2))
87+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTPKG_GLOB_$(2))
88+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTDOC_GLOB_$(2))
89+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTI_GLOB_$(2))
90+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUST_GLOB_$(2))
91+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUSTLLVM_$(2))
9292
$(Q)rm -f $$(HLIB$(1)_H_$(2))/libstd.rlib
9393

9494
endef
@@ -105,22 +105,22 @@ clean$(1)_T_$(2)_H_$(3):
105105
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustpkg$(X)
106106
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/serializer$(X)
107107
$(Q)rm -f $$(TBIN$(1)_T_$(2)_H_$(3))/rustdoc$(X)
108-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBFUZZER)
109-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTPKG)
110-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC)
111-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUNTIME)
112-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB)
113-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB)
114-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC)
115-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX)
116-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CORELIB_GLOB)
117-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(STDLIB_GLOB)
118-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTC_GLOB)
119-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBSYNTAX_GLOB)
120-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBFUZZER_GLOB)
121-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTPKG_GLOB)
122-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTDOC_GLOB)
123-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM)
108+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBFUZZER_$(2))
109+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTPKG_$(2))
110+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTDOC_$(2))
111+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUNTIME_$(2))
112+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB_$(2))
113+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2))
114+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(2))
115+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(2))
116+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CORELIB_GLOB_$(2))
117+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(STDLIB_GLOB_$(2))
118+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTC_GLOB_$(2))
119+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBSYNTAX_GLOB_$(2))
120+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBFUZZER_GLOB_$(2))
121+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTPKG_GLOB_$(2))
122+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTDOC_GLOB_$(2))
123+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(2))
124124
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libstd.rlib
125125
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a
126126
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/librun_pass_stage* # For unix

0 commit comments

Comments
 (0)