projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Extend hptInstances to also cover family instances
[ghc-hetmet.git]
/
compiler
/
Makefile
diff --git
a/compiler/Makefile
b/compiler/Makefile
index
9ef59c4
..
19fba4e
100644
(file)
--- a/
compiler/Makefile
+++ b/
compiler/Makefile
@@
-415,10
+415,6
@@
ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
SRC_HC_OPTS += -DGHCI -package template-haskell
PKG_DEPENDS += template-haskell
SRC_HC_OPTS += -DGHCI -package template-haskell
PKG_DEPENDS += template-haskell
-# Should the debugger commands be enabled?
-ifeq "$(GhciWithDebugger)" "YES"
-SRC_HC_OPTS += -DDEBUGGER
-endif
# Should GHCI be building info tables in the TABLES_NEXT_TO_CODE style
# or not?
ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO"
# Should GHCI be building info tables in the TABLES_NEXT_TO_CODE style
# or not?
ifeq "$(GhcEnableTablesNextToCode) $(GhcUnregisterised)" "YES NO"
@@
-529,16
+525,6
@@
SRC_HC_OPTS += -package Cabal
PKG_DEPENDS += Cabal
endif
PKG_DEPENDS += Cabal
endif
-# We use Text.Regex which is in regex-compat with GHC 6.6+
-ifeq "$(bootstrapped)" "YES"
-SRC_HC_OPTS += -package regex-compat
-PKG_DEPENDS += regex-compat
-else
-ifeq "$(ghc_ge_605)" "YES"
-SRC_HC_OPTS += -package regex-compat
-endif
-endif
-
ifeq "$(ghc_ge_603)" "YES"
# Ignore lang, to avoid potential clash with the Generics module if
# lang happens to be a dependency of some exposed package in the local
ifeq "$(ghc_ge_603)" "YES"
# Ignore lang, to avoid potential clash with the Generics module if
# lang happens to be a dependency of some exposed package in the local
@@
-731,6
+717,7
@@
all :: $(odir)/ghc-inplace ghc-inplace
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
all :: $(odir)/ghc-inplace.bat ghc-inplace.bat
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
all :: $(odir)/ghc-inplace.bat ghc-inplace.bat
+CLEAN_FILES += $(odir)/ghc-inplace.bat ghc-inplace.bat
endif
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
endif
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
@@
-741,7
+728,7
@@
else
SCRIPT_SHELL = /bin/sh
endif
SCRIPT_SHELL = /bin/sh
endif
-# Note 2
+# MSys Note 2
# On MSys, we must use the following script for ghc-inplace:
# exec /c/darcs/fc-branch-2/compiler/stage1/ghc -Bc:/darcs/fc-branch-2 "$@"
# That is,
# On MSys, we must use the following script for ghc-inplace:
# exec /c/darcs/fc-branch-2/compiler/stage1/ghc -Bc:/darcs/fc-branch-2 "$@"
# That is,
@@
-762,10
+749,16
@@
$(odir)/ghc-inplace : $(GHC_PROG)
# Re exec, see note 2 above
chmod 755 $@
# Re exec, see note 2 above
chmod 755 $@
+# MSys Note 3
+# When we generate a .bat file, we must also use the form
+# @call c:\darcs\fc-branch-2\compiler\stage1\ghc-inplace
+# else the cmd shell gets confused; indeed it seems to simply hang
+# Hence the use of $(FPTOOLS_TOP_ABS_PLATFORM) here, just like MSys Note 2
+
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
ghc-inplace.bat $(odir)/ghc-inplace.bat: $(GHC_PROG)
@$(RM) $@
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
ghc-inplace.bat $(odir)/ghc-inplace.bat: $(GHC_PROG)
@$(RM) $@
- echo '@call $(subst /,\,$(GHC_COMPILER_DIR_ABS)/$(GHC_PROG)) -B$(FPTOOLS_TOP_ABS_PLATFORM) %*' >> $@
+ echo '@call $(subst /,\,$(FPTOOLS_TOP_ABS_PLATFORM)/$(GHC_COMPILER_DIR_REL)/$(GHC_PROG)) -B$(FPTOOLS_TOP_ABS_PLATFORM) %*' >> $@
chmod 755 $@
endif
chmod 755 $@
endif