[commit: ghc] master: testsuite: fix up T11223's Makefile (0fa1d07)

git at git.haskell.org git at git.haskell.org
Thu Apr 28 23:50:19 UTC 2016


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/0fa1d075eb1ec07ff6e22472fc5d6f08b3206a2f/ghc

>---------------------------------------------------------------

commit 0fa1d075eb1ec07ff6e22472fc5d6f08b3206a2f
Author: Austin Seipp <austin at well-typed.com>
Date:   Thu Apr 28 23:42:55 2016 +0000

    testsuite: fix up T11223's Makefile
    
    As reported by Simon on ghc-devs, this causes the build on Windows
    to fail because it cannot find the `cc` command. The Makefile here
    actually already sets `GCC=gcc`, but for some reason then uses both
    `$(GCC)` and `$(CC)` to refer to C compilation.
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>
    
    Reviewed By: thomie
    
    Differential Revision: https://phabricator.haskell.org/D2158


>---------------------------------------------------------------

0fa1d075eb1ec07ff6e22472fc5d6f08b3206a2f
 testsuite/tests/rts/T11223/Makefile | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/testsuite/tests/rts/T11223/Makefile b/testsuite/tests/rts/T11223/Makefile
index 6bcb9a5..895c6b8 100644
--- a/testsuite/tests/rts/T11223/Makefile
+++ b/testsuite/tests/rts/T11223/Makefile
@@ -6,7 +6,7 @@ include $(TOP)/mk/test.mk
 # Testing RTS linker object resolution
 #
 
-GCC=gcc
+CC=gcc
 
 .PHONY: t_11223_simple_link
 t_11223_simple_link:
@@ -87,40 +87,40 @@ t_11223_link_order_b_a_2_succeed:
 .PHONY: t_11223_weak_only_link_fail
 t_11223_weak_only_link_fail:
 	$(RM) -f power_w1.o power.hi power.o
-	"$(GCC)" -c power.c -DWEAK -o power_w1.o
+	"$(CC)" -c power.c -DWEAK -o power_w1.o
 	echo main | "$(TEST_HC)" --interactive -v0 $(filter-out -rtsopts, $(TEST_HC_OPTS)) -ignore-dot-ghci power.hs power_w1.o
 
 .PHONY: t_11223_weak_only_link_succeed
 t_11223_weak_only_link_succeed:
 	$(RM) -f power_w2.o power3.hi power3.o
-	"$(GCC)" -c power_slow.c -DWEAK -o power_w2.o
+	"$(CC)" -c power_slow.c -DWEAK -o power_w2.o
 	echo main | "$(TEST_HC)" --interactive -v0 $(filter-out -rtsopts, $(TEST_HC_OPTS)) -ignore-dot-ghci power3.hs power_w2.o
 
 .PHONY: t_11223_weak_both_link_order_a_b_succeed
 t_11223_weak_both_link_order_a_b_succeed:
 	$(RM) -f fast_power_w3.o slow_power_w3.o power3.hi power3.o
-	"$(GCC)" -c power_slow.c -DWEAK -o slow_power_w3.o
-	"$(GCC)" -c power.c -DWEAK -o fast_power_w3.o
+	"$(CC)" -c power_slow.c -DWEAK -o slow_power_w3.o
+	"$(CC)" -c power.c -DWEAK -o fast_power_w3.o
 	echo main | "$(TEST_HC)" --interactive -v0 $(filter-out -rtsopts, $(TEST_HC_OPTS)) -ignore-dot-ghci power3.hs fast_power_w3.o slow_power_w3.o
 
 .PHONY: t_11223_weak_both_link_order_b_a_succeed
 t_11223_weak_both_link_order_b_a_succeed:
 	$(RM) -f fast_power_w4.o slow_power_w4.o power3.hi power3.o
-	"$(GCC)" -c power_slow.c -DWEAK -o slow_power_w4.o
-	"$(GCC)" -c power.c -DWEAK -o fast_power_w4.o
+	"$(CC)" -c power_slow.c -DWEAK -o slow_power_w4.o
+	"$(CC)" -c power.c -DWEAK -o fast_power_w4.o
 	echo main | "$(TEST_HC)" --interactive -v0 $(filter-out -rtsopts, $(TEST_HC_OPTS)) -ignore-dot-ghci power3.hs slow_power_w4.o fast_power_w4.o
 
 .PHONY: t_11223_weak_single_link_order_a_b_succeed
 t_11223_weak_single_link_order_a_b_succeed:
 	$(RM) -f fast_power_w5.o slow_power_w5.o power3.hi power3.o
-	"$(GCC)" -c power_slow.c -o slow_power_w5.o
-	"$(GCC)" -c power.c -DWEAK -o fast_power_w5.o
+	"$(CC)" -c power_slow.c -o slow_power_w5.o
+	"$(CC)" -c power.c -DWEAK -o fast_power_w5.o
 	echo main | "$(TEST_HC)" --interactive -v0 $(filter-out -rtsopts, $(TEST_HC_OPTS)) -ignore-dot-ghci power3.hs fast_power_w5.o slow_power_w5.o
 
 .PHONY: t_11223_weak_single_link_order_b_a_succeed
 t_11223_weak_single_link_order_b_a_succeed:
 	$(RM) -f fast_power_w6.o slow_power_w6.o power3.hi power3.o
-	"$(GCC)" -c power_slow.c -DWEAK -o slow_power_w6.o
-	"$(GCC)" -c power.c -o fast_power_w6.o
+	"$(CC)" -c power_slow.c -DWEAK -o slow_power_w6.o
+	"$(CC)" -c power.c -o fast_power_w6.o
 	echo main | "$(TEST_HC)" --interactive -v0 $(filter-out -rtsopts, $(TEST_HC_OPTS)) -ignore-dot-ghci power3.hs slow_power_w6.o fast_power_w6.o
 



More information about the ghc-commits mailing list