Ticket #3146: patch-testsuite-mk-boilerplate.mk.diff

File patch-testsuite-mk-boilerplate.mk.diff, 1.5 KB (added by gwright, 6 years ago)

Patch for testsuite-6.10.2/mk/boilerplate.mk

  • testsuite-6.10.2/mk/boilerplate.mk

    old new  
    5353OLD_BUILD_SYSTEM_STAGE2_GHC := $(abspath $(TOP)/../ghc/stage2-inplace/ghc) 
    5454OLD_BUILD_SYSTEM_STAGE3_GHC := $(abspath $(TOP)/../ghc/stage3-inplace/ghc) 
    5555OLD_BUILD_SYSTEM_GHC_PKG    := $(abspath $(TOP)/../utils/ghc-pkg/install-inplace/bin/ghc-pkg) 
     56OLD_BUILD_SYSTEM_HSC2HS     := $(abspath $(TOP)/../utils/hsc2hs/install-inplace/bin/hsc2hs) 
    5657OLD_BUILD_SYSTEM_HP2PS      := $(abspath $(TOP)/../utils/hp2ps/hp2ps) 
    5758ifneq "$(wildcard $(OLD_BUILD_SYSTEM_STAGE1_GHC) $(OLD_BUILD_SYSTEM_STAGE1_GHC).exe)" "" 
    5859 
     
    6768endif 
    6869endif 
    6970GHC_PKG := $(OLD_BUILD_SYSTEM_GHC_PKG) 
     71HSC2HS := $(OLD_BUILD_SYSTEM_HSC2HS) 
    7072HP2PS_ABS := $(OLD_BUILD_SYSTEM_HP2PS) 
    7173# XXX This GCC definition is a hack. Once the in-tree GHC has a gcc in the 
    7274# right place we won't need to do this, as Cabal will be able to find 
     
    105107GHC_PKG := $(dir $(TEST_HC))/ghc-pkg 
    106108endif 
    107109 
     110ifeq "$(HSC2HS)" "" 
     111HSC2HS := $(dir $(TEST_HC))/hsc2hs 
     112endif 
     113 
    108114ifeq "$(HP2PS_ABS)" "" 
    109115HP2PS_ABS := $(dir $(TEST_HC))/hp2ps 
    110116endif 
     
    119125$(error Cannot find ghc-pkg: $(GHC_PKG)) 
    120126endif 
    121127 
     128$(eval $(call canonicaliseExecutable,HSC2HS)) 
     129ifeq "$(wildcard $(HSC2HS))" "" 
     130$(error Cannot find ghc-pkg: $(HSC2HS)) 
     131endif 
     132 
    122133$(eval $(call canonicaliseExecutable,HP2PS_ABS)) 
    123134ifeq "$(wildcard $(HP2PS_ABS))" "" 
    124135$(error Cannot find hp2ps: $(HP2PS_ABS))