Fix quoting in the testsuite timeout program's Makefile
authorIan Lynagh <igloo@earth.li>
Tue, 13 Oct 2009 14:43:52 +0000 (14:43 +0000)
committerIan Lynagh <igloo@earth.li>
Tue, 13 Oct 2009 14:43:52 +0000 (14:43 +0000)
testsuite/timeout/Makefile

index 44c3304..7fa6e25 100644 (file)
@@ -16,7 +16,7 @@ PREFIX := $(abspath install-inplace)
 $(eval $(call canonicalise,PREFIX))
 
 ifneq "$(GCC)" ""
-WITH_GCC = --with-gcc=$(GCC)
+WITH_GCC = --with-gcc='$(GCC)'
 endif
 
 ifeq "$(filter thr, $(GhcRTSWays))" ""
@@ -29,12 +29,12 @@ $(TIMEOUT_PROGRAM): timeout.py
 else
 $(TIMEOUT_PROGRAM): timeout.hs
        rm -rf install-inplace
-       $(TEST_HC) --make Setup
-       ./Setup configure --with-compiler=$(TEST_HC) \
-                         --with-hc-pkg=$(GHC_PKG) \
-                         --with-hsc2hs=$(HSC2HS) \
+       '$(TEST_HC)' --make Setup
+       ./Setup configure --with-compiler='$(TEST_HC)' \
+                         --with-hc-pkg='$(GHC_PKG)' \
+                         --with-hsc2hs='$(HSC2HS)' \
                          $(WITH_GCC) \
-                         --ghc-option=-threaded --prefix=$(PREFIX)
+                         --ghc-option=-threaded --prefix='$(PREFIX)'
        ./Setup build
        ./Setup install
 endif
@@ -43,7 +43,7 @@ boot all :: calibrate.out $(TIMEOUT_PROGRAM)
 
 calibrate.out:
        $(RM) -f TimeMe.o TimeMe.hi TimeMe TimeMe.exe
-       $(PYTHON) calibrate "$(GHC_STAGE1)" > $@
+       $(PYTHON) calibrate '$(GHC_STAGE1)' > $@
 # We use stage 1 to do the calibration, as stage 2 may not exist.
 # This isn't necessarily the compiler we'll be running the testsuite
 # with, but it's really the performance of the machine that we're