From a407d076bd97d2fea53d78cb119c72aab18aceff Mon Sep 17 00:00:00 2001 From: Janus Troelsen Date: Thu, 18 Aug 2016 15:33:58 +0200 Subject: [PATCH] remove hsc2hs monkey-patching --- EHC/ehclib/files2.mk | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/EHC/ehclib/files2.mk b/EHC/ehclib/files2.mk index 5a9fb0d5a..c8078fa5b 100644 --- a/EHC/ehclib/files2.mk +++ b/EHC/ehclib/files2.mk @@ -359,10 +359,7 @@ $(EHCLIB_CHS_ALL_DRV_HS): $(EHCLIB_BLD_VARIANT_ASPECTS_PREFIX)%.hs: $(EHCLIB_SRC # we only apply the patch on platforms where HSC2HS_EXTRA is specified, otherwise we use the original method $(EHCLIB_HSC_ALL_DRV_HS): $(EHCLIB_BLD_VARIANT_ASPECTS_PREFIX)%.hs: $(EHCLIB_SRC_PREFIX)%.hsc mkdir -p $(@D) && \ - if grep -q 'HSC2HS_EXTRA' $(HSC2HS) ;\ - then \ - sed -e 's/^HSC2HS_EXTRA=.*$$/HSC2HS_EXTRA=/' < $(HSC2HS) > $(EHCLIB_BLD_VARIANT_ASPECTS_PREFIX)hsc2hs && chmod +x $(EHCLIB_BLD_VARIANT_ASPECTS_PREFIX)hsc2hs && \ - $(EHCLIB_BLD_VARIANT_ASPECTS_PREFIX)hsc2hs -v --output=$@ \ + hsc2hs -v --output=$@ \ --include=HsFFI.h \ --cc=$(GCC) \ -D__UHC__=$(EH_VERSION_ASNUMBER) \ @@ -372,20 +369,7 @@ $(EHCLIB_HSC_ALL_DRV_HS): $(EHCLIB_BLD_VARIANT_ASPECTS_PREFIX)%.hs: $(EHCLIB_SRC -I$(call FUN_INSTALLABS_VARIANT_INC_SHARED_PREFIX,$(EHC_VARIANT)) \ $(foreach pkg,$(EHC_PACKAGES_ASSUMED),-I$(EHCLIB_SRC_PREFIX)$(pkg)/include/) \ $(foreach pkg,$(EHC_PACKAGES_ASSUMED),-I$(call FUN_MK_PKG_INC_DIR,$(call FUN_INSTALL_PKG_PREFIX,$(call FUN_PKG_VERSIONED,$(pkg))))) \ - $< ; \ - else \ - $(HSC2HS) -v --output=$@ --no-compile --include=HsFFI.h $< && \ - $(GCC) -D__UHC__=$(EH_VERSION_ASNUMBER) \ - $(RTS_GCC_CC_OPTS_VARIANT_TARGET) \ - -I$(call FUN_INSTALLABS_VARIANT_INC_TARGET_PREFIX,$(EHC_VARIANT),$(EHC_VARIANT_TARGET)) \ - -I$(call FUN_INSTALLABS_VARIANT_INC_SHARED_PREFIX,$(EHC_VARIANT)) \ - $(foreach pkg,$(EHC_PACKAGES_ASSUMED),-I$(EHCLIB_SRC_PREFIX)$(pkg)/include/) \ - $(foreach pkg,$(EHC_PACKAGES_ASSUMED),-I$(call FUN_MK_PKG_INC_DIR,$(call FUN_INSTALL_PKG_PREFIX,$(call FUN_PKG_VERSIONED,$(pkg))))) \ - -o $(@:.hs=_hsc_make) \ - $(@:.hs=_hsc_make.c) \ - && $(@:.hs=_hsc_make) > $@ \ - && rm -f $(@:.hs=_hsc_make.c) ; \ - fi \ + $< \ && touch $@ # generate shell script for mapping package names