Fix passing CC to maketest.py when CC has arguments.

For example, I configure with CC="ccache /usr/lib/icecc/bin/gcc".

Author: DiamondLovesYou

mk/tests.mk

@@ -1056,15 +1056,16 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
         $$(MAKE) \
 	    $$(HBIN$(1)_H_$(3))/rustc$$(X_$(3)) \
 	    $(3)/test/run-make/$$* \
-	    $$(CC_$(3)) \
+	    '$$(CC_$(3))' \
 	    "$$(CFG_GCCISH_CFLAGS_$(3))" \
 	    $$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) \
 	    "$$(TESTNAME)" \
 	    $$(LD_LIBRARY_PATH_ENV_NAME$(1)_T_$(2)_H_$(3)) \
 	    "$$(LD_LIBRARY_PATH_ENV_HOSTDIR$(1)_T_$(2)_H_$(3))" \
 	    "$$(LD_LIBRARY_PATH_ENV_TARGETDIR$(1)_T_$(2)_H_$(3))" \
 	    $(1) \
-	    $$(S)
+	    $$(S) \
+	    $(3)
 	@touch -r [email protected]_time $$@ && rm [email protected]_time
 else
 # FIXME #11094 - The above rule doesn't work right for multiple targets

src/etc/maketest.py

@@ -12,6 +12,7 @@
 import os
 import sys
 
+target_triple = sys.argv[14]
 
 def normalize_path(v):
     """msys1/msys2 automatically converts `/abs/path1:/abs/path2` into
@@ -22,8 +23,11 @@ def normalize_path(v):
     windows paths so it is really error-prone. revert it for peace."""
     v = v.replace('\\', '/')
     # c:/path -> /c/path
-    if ':/' in v:
-        v = '/' + v.replace(':/', '/')
+    # "c:/path" -> "/c/path"
+    start = v.find(':/')
+    while start != -1:
+        v = v[:start - 1] + '/' + v[start - 1:start] + v[start + 1:]
+        start = v.find(':/')
     return v
 
 
@@ -39,17 +43,21 @@ def convert_path_spec(name, value):
     return value
 
 make = sys.argv[2]
-putenv('RUSTC', os.path.abspath(sys.argv[3]))
-putenv('TMPDIR', os.path.abspath(sys.argv[4]))
-putenv('CC', sys.argv[5] + ' ' + sys.argv[6])
-putenv('RUSTDOC', os.path.abspath(sys.argv[7]))
+os.putenv('RUSTC', os.path.abspath(sys.argv[3]))
+os.putenv('TMPDIR', os.path.abspath(sys.argv[4]))
+os.putenv('CC', sys.argv[5] + ' ' + sys.argv[6])
+os.putenv('RUSTDOC', os.path.abspath(sys.argv[7]))
 filt = sys.argv[8]
 putenv('LD_LIB_PATH_ENVVAR', sys.argv[9])
 putenv('HOST_RPATH_DIR', os.path.abspath(sys.argv[10]))
 putenv('TARGET_RPATH_DIR', os.path.abspath(sys.argv[11]))
 putenv('RUST_BUILD_STAGE', sys.argv[12])
-putenv('S', os.path.abspath(sys.argv[13]))
-putenv('PYTHON', sys.executable)
+os.putenv('S', os.path.abspath(sys.argv[13]))
+os.putenv('PYTHON', sys.executable)
+os.putenv('TARGET', target_triple)
+
+if 'msvc' in target_triple:
+    os.putenv('IS_MSVC', '1')
 
 if filt not in sys.argv[1]:
     sys.exit(0)

src/test/run-make/archive-duplicate-names/Makefile

@@ -1,5 +1,10 @@
 -include ../tools.mk
 
+ifdef IS_MSVC
+# FIXME #27979
+all:
+
+else
 all:
 	mkdir $(TMPDIR)/a
 	mkdir $(TMPDIR)/b
@@ -9,3 +14,4 @@ all:
 	$(RUSTC) foo.rs
 	$(RUSTC) bar.rs
 	$(call RUN,bar)
+endif

src/test/run-make/c-dynamic-dylib/Makefile

@@ -1,5 +1,11 @@
 -include ../tools.mk
 
+ifdef IS_MSVC
+# FIXME #27979
+all:
+
+else
+
 # This hits an assertion in the linker on older versions of osx apparently
 ifeq ($(shell uname),Darwin)
 all:
@@ -12,3 +18,4 @@ all: $(call DYLIB,cfoo)
 	$(call REMOVE_DYLIBS,cfoo)
 	$(call FAIL,bar)
 endif
+endif

src/test/run-make/c-dynamic-rlib/Makefile

@@ -3,6 +3,12 @@
 # This overrides the LD_LIBRARY_PATH for RUN
 TARGET_RPATH_DIR:=$(TARGET_RPATH_DIR):$(TMPDIR)
 
+ifdef IS_MSVC
+# FIXME #27979
+all:
+
+else
+
 # This hits an assertion in the linker on older versions of osx apparently
 ifeq ($(shell uname),Darwin)
 all:
@@ -15,3 +21,4 @@ all: $(call DYLIB,cfoo)
 	$(call REMOVE_DYLIBS,cfoo)
 	$(call FAIL,bar)
 endif
+endif

src/test/run-make/c-link-to-rust-dylib/Makefile

@@ -2,9 +2,16 @@
 
 HOST_LIB_DIR=$(TMPDIR)/../../../stage$(RUST_BUILD_STAGE)/lib
 
+ifdef IS_MSVC
+# FIXME #27979
+all:
+
+else
 all:
 	$(RUSTC) foo.rs
 	$(CC) bar.c -lfoo -o $(call RUN_BINFILE,bar) $(call RPATH_LINK_SEARCH,$(HOST_LIB_DIR)) -Wl,-rpath,$(TMPDIR) $(EXTRACFLAGS)
 	$(call RUN,bar)
 	$(call REMOVE_DYLIBS,foo)
 	$(call FAIL,bar)
+
+endif

src/test/run-make/c-link-to-rust-staticlib/Makefile

@@ -2,6 +2,12 @@
 
 EXTRAFLAGS := $(EXTRACFLAGS)
 
+ifdef IS_MSVC
+# FIXME #27979
+all:
+
+else
+
 # FIXME: ignore freebsd
 ifneq ($(shell uname),FreeBSD)
 all:
@@ -15,3 +21,5 @@ else
 all:
 
 endif
+
+endif

src/test/run-make/c-static-dylib/Makefile

@@ -1,9 +1,15 @@
 -include ../tools.mk
 
+ifdef IS_MSVC
+# FIXME #27979
+all:
+
+else
 all: $(call STATICLIB,cfoo)
 	$(RUSTC) foo.rs -C prefer-dynamic
 	$(RUSTC) bar.rs
 	rm $(TMPDIR)/$(call STATICLIB_GLOB,cfoo)
 	$(call RUN,bar)
 	$(call REMOVE_DYLIBS,foo)
 	$(call FAIL,bar)
+endif

src/test/run-make/c-static-rlib/Makefile

@@ -1,8 +1,15 @@
 -include ../tools.mk
 
+ifdef IS_MSVC
+# FIXME #27979
+all:
+
+else
 all: $(call STATICLIB,cfoo)
 	$(RUSTC) foo.rs
 	$(RUSTC) bar.rs
 	$(call REMOVE_RLIBS,foo)
 	rm $(TMPDIR)/$(call STATICLIB_GLOB,cfoo)
 	$(call RUN,bar)
+
+endif

src/test/run-make/compiler-lookup-paths/Makefile

@@ -1,5 +1,10 @@
 -include ../tools.mk
 
+ifdef IS_MSVC
+# FIXME #27979
+all:
+
+else
 all: $(TMPDIR)/libnative.a
 	mkdir -p $(TMPDIR)/crate
 	mkdir -p $(TMPDIR)/native
@@ -28,3 +33,5 @@ all: $(TMPDIR)/libnative.a
 	$(RUSTC) f.rs -L native=$(TMPDIR)/e1 -L $(TMPDIR)/e2
 	$(RUSTC) f.rs -L dependency=$(TMPDIR)/e1 -L $(TMPDIR)/e2
 	$(RUSTC) f.rs -L dependency=$(TMPDIR)/e1 -L crate=$(TMPDIR)/e2
+
+endif