[llvm-commits] [test-suite] r114580 - in /test-suite/trunk: MultiSource/Makefile.multisrc SingleSource/Makefile.singlesrc

[Daniel Dunbar]

Author: ddunbar
Date: Wed Sep 22 16:07:11 2010
New Revision: 114580

URL: http://llvm.org/viewvc/llvm-project?rev=114580&view=rev
Log:
TEST=simple: Add support for a new make variable, LD_ENV_OVERRIDES, which can be
used to set additional environment variables before calling link steps.

Modified:
    test-suite/trunk/MultiSource/Makefile.multisrc
    test-suite/trunk/SingleSource/Makefile.singlesrc

Modified: test-suite/trunk/MultiSource/Makefile.multisrc
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Makefile.multisrc?rev=114580&r1=114579&r2=114580&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Makefile.multisrc (original)
+++ test-suite/trunk/MultiSource/Makefile.multisrc Wed Sep 22 16:07:11 2010
@@ -90,7 +90,7 @@
 /^program/   { sum += $$2; }\
 !/^program/  { print; }\
 END       { printf("program %f\n", sum); }' > $@.compile.time
-	-$(LCXX) -o $@ $^ $(LDFLAGS) $(CFLAGS) $(TARGET_FLAGS)
+	-$(LD_ENV_OVERRIDES) $(LCXX) -o $@ $^ $(LDFLAGS) $(CFLAGS) $(TARGET_FLAGS)
 
 Output/%.native: $(NObjects)
 	-$(CXX) -o $@ $(NObjects) $(LDFLAGS) $(CFLAGS) $(TARGET_FLAGS)

Modified: test-suite/trunk/SingleSource/Makefile.singlesrc
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/SingleSource/Makefile.singlesrc?rev=114580&r1=114579&r2=114580&view=diff
==============================================================================
--- test-suite/trunk/SingleSource/Makefile.singlesrc (original)
+++ test-suite/trunk/SingleSource/Makefile.singlesrc Wed Sep 22 16:07:11 2010
@@ -70,7 +70,7 @@
 
 Output/%.simple: Output/%.llvm.o Output/.dir
 	-$(CP) $<.compile.time $@.compile.time
-	-$(LCXX) -o $@ $< $(LDFLAGS) $(CFLAGS) $(TARGET_FLAGS)
+	-$(LD_ENV_OVERRIDES) $(LCXX) -o $@ $< $(LDFLAGS) $(CFLAGS) $(TARGET_FLAGS)
 
 # FIXME: LIBS should be specified, not hardcoded to -lm
 Output/%.native: $(SourceDir)/%.c Output/.dir