run-make tests must distinguish between HOST_RPATH and TARGET_RPATH.

What this commit does:

* Pass both of the (newly introduced) HOST and TARGET rpath setup vars
  to `maketest.py`

* Update `maketest.py` to no longer update the LD_LIBRARY_PATH itself
  Instead, it passes along the HOST and TARGET rpath setup vars in
  environment variables `HOST_RPATH_ENV` and `TARGET_RPATH_ENV`

* Cleanup: Distinguish in tools.mk between the command to run (`RUN`)
  and the file to generate to drive that command (`RUN_BINFILE`).  The
  main thing this enables is that `RUN` can now setup the
  `TARGET_RPATH_ENV` without having to dirty up the runner code in
  each of the `run-make` Makefiles.

I should have tried to fix rust-lang#13746 but I got distracted, and decided
fixing that is orthgonal to the changes in this branch of work.

Note that even with these changes, `make check-stage1` still does not
work all the way to completion.  (It just gets further than it did
before, but still breaks down in the `run-make` tests.)

Author: pnkfelix

mk/tests.mk

@@ -908,7 +908,8 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
 	    "$$(CC_$(3)) $$(CFG_GCCISH_CFLAGS_$(3))" \
 	    $$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3)) \
 	    "$$(TESTNAME)" \
-	    "$$(RPATH_VAR$(1)_T_$(2)_H_$(3))"
+	    "$$(HOST_RPATH_VAR$(1)_T_$(2)_H_$(3))" \
+	    "$$(TARGET_RPATH_VAR$(1)_T_$(2)_H_$(3))"
 	@touch $$@
 else
 # FIXME #11094 - The above rule doesn't work right for multiple targets

src/etc/maketest.py

@@ -23,9 +23,11 @@
 os.putenv('CC', sys.argv[5])
 os.putenv('RUSTDOC', os.path.abspath(sys.argv[6]))
 filt = sys.argv[7]
-ldpath = sys.argv[8]
-if ldpath != '':
-    os.putenv(ldpath.split('=')[0], ldpath.split('=')[1])
+os.putenv('HOST_RPATH_ENV', sys.argv[8]);
+host_ldpath = sys.argv[8]
+#if host_ldpath != '':
+#    os.putenv(host_ldpath.split('=')[0], host_ldpath.split('=')[1])
+os.putenv('TARGET_RPATH_ENV', sys.argv[9]);
 
 if not filt in sys.argv[1]:
     sys.exit(0)

src/test/run-make/bootstrap-from-c-with-green/Makefile

@@ -3,7 +3,7 @@
 all:
 	$(RUSTC) lib.rs
 	ln -nsf $(call DYLIB,boot-*) $(call DYLIB,boot)
-	$(CC) main.c -o $(call RUN,main) -lboot
+	$(CC) main.c -o $(call RUN_BINFILE,main) -lboot
 	$(call RUN,main)
 	rm $(call DYLIB,boot)
 	$(call FAIL,main)

src/test/run-make/bootstrap-from-c-with-native/Makefile

@@ -3,7 +3,7 @@
 all:
 	$(RUSTC) lib.rs
 	ln -nsf $(call DYLIB,boot-*) $(call DYLIB,boot)
-	$(CC) main.c -o $(call RUN,main) -lboot
+	$(CC) main.c -o $(call RUN_BINFILE,main) -lboot
 	$(call RUN,main)
 	rm $(call DYLIB,boot)
 	$(call FAIL,main)

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

@@ -3,7 +3,7 @@
 all:
 	$(RUSTC) foo.rs
 	ln -s $(call DYLIB,foo-*) $(call DYLIB,foo)
-	$(CC) bar.c -lfoo -o $(call RUN,bar) -Wl,-rpath,$(TMPDIR)
+	$(CC) bar.c -lfoo -o $(call RUN_BINFILE,bar) -Wl,-rpath,$(TMPDIR)
 	$(call RUN,bar)
 	rm $(call DYLIB,foo)
 	$(call FAIL,bar)

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

@@ -9,7 +9,7 @@ ifneq ($(shell uname),FreeBSD)
 all:
 	$(RUSTC) foo.rs
 	ln -s $(call STATICLIB,foo-*) $(call STATICLIB,foo)
-	$(CC) bar.c -lfoo -o $(call RUN,bar) $(EXTRAFLAGS) -lstdc++
+	$(CC) bar.c -lfoo -o $(call RUN_BINFILE,bar) $(EXTRAFLAGS) -lstdc++
 	$(call RUN,bar)
 	rm $(call STATICLIB,foo*)
 	$(call RUN,bar)

src/test/run-make/lto-smoke-c/Makefile

@@ -15,5 +15,5 @@ CC := $(CC:-g=)
 all:
 	$(RUSTC) foo.rs -Z lto
 	ln -s $(call STATICLIB,foo-*) $(call STATICLIB,foo)
-	$(CC) bar.c -lfoo -o $(call RUN,bar) $(EXTRAFLAGS) -lstdc++
+	$(CC) bar.c -lfoo -o $(call RUN_BINFILE,bar) $(EXTRAFLAGS) -lstdc++
 	$(call RUN,bar)

src/test/run-make/tools.mk

@@ -4,8 +4,13 @@ export DYLD_LIBRARY_PATH:=$(TMPDIR):$(DYLD_LIBRARY_PATH)
 RUSTC := $(RUSTC) --out-dir $(TMPDIR) -L $(TMPDIR)
 CC := $(CC) -L $(TMPDIR)
 
-RUN = $(TMPDIR)/$(1)
-FAILS = $(TMPDIR)/$(1) && exit 1 || exit 0
+# This is the name of the binary we will generate and run; use this
+# e.g. for `$(CC) -o $(RUN_BINFILE)`.
+RUN_BINFILE = $(TMPDIR)/$(1)
+# This the basic way we will invoke the generated binary.  It sets the
+# LD_LIBRARY_PATH environment variable before running the binary.
+RUN = $(TARGET_RPATH_ENV) $(RUN_BINFILE)
+FAILS = $(TARGET_RPATH_ENV) ( $(RUN_BINFILE) && exit 1 || exit 0 )
 
 RLIB_GLOB = lib$(1)*.rlib
 STATICLIB = $(TMPDIR)/lib$(1).a