Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
GHC
Commits
f5817e0a
Commit
f5817e0a
authored
Nov 08, 2008
by
Ian Lynagh
Browse files
ghc_ge_605 is now always YES
parent
fb8bf853
Changes
6
Hide whitespace changes
Inline
Side-by-side
compiler/Makefile.local
View file @
f5817e0a
...
...
@@ -23,11 +23,6 @@ GHC_OPTS += $(GhcStage$(stage)HcOpts)
GHC_OPTS
+=
$(
addprefix
-optc
,
$(MACOSX_DEPLOYMENT_CC_OPTS)
)
LIB_LD_OPTS
+=
$(
addprefix
-optl
,
$(MACOSX_DEPLOYMENT_LD_OPTS)
)
# Work around a bug "splitTyConApp e1{tv a2iZ}" in 6.4.2:
ifeq
"$(ghc_ge_605)" "NO"
dist-stage1/build/IOEnv.o
:
GHC_OPTS += -O0
endif
# XXX These didn't work in the old build system, according to the
# comment at least. We should actually handle them properly at some
# point:
...
...
configure.ac
View file @
f5817e0a
...
...
@@ -671,10 +671,8 @@ if test "$WithGhc" != ""; then
AC_SUBST(GhcPatchLevel)dnl
GhcMinVersion2=`echo "$GhcMinVersion" | sed 's/^\\(.\\)$/0\\1/'`
GhcCanonVersion="$GhcMajVersion$GhcMinVersion2"
if test $GhcCanonVersion -ge 605; then ghc_ge_605=YES; else ghc_ge_605=NO; fi
if test $GhcCanonVersion -ge 607; then ghc_ge_607=YES; else ghc_ge_607=NO; fi
if test $GhcCanonVersion -ge 609; then ghc_ge_609=YES; else ghc_ge_609=NO; fi
AC_SUBST(ghc_ge_605)dnl
AC_SUBST(ghc_ge_607)dnl
AC_SUBST(ghc_ge_609)dnl
fi
...
...
libraries/Makefile
View file @
f5817e0a
...
...
@@ -116,9 +116,6 @@ subdirs:
HERE_ABS
=
$(FPTOOLS_TOP_ABS)
/libraries
CABAL_GHC_FLAGS
=
-Wall
ifeq
"$(ghc_ge_605)" "NO"
CABAL_GHC_FLAGS
+=
-cpp
endif
BOOTSTRAPPING_FLAGS
=
$(CABAL_GHC_FLAGS)
-DCABAL_VERSION
=
$(CABAL_VERSION)
-odir
$(HERE_ABS)
/bootstrapping
-hidir
$(HERE_ABS)
/bootstrapping
-i
$(HERE_ABS)
/Cabal
-i
$(HERE_ABS)
/filepath
-i
$(HERE_ABS)
/hpc
...
...
mk/config.mk.in
View file @
f5817e0a
...
...
@@ -929,14 +929,12 @@ GhcPatchLevel = @ProjectPatchLevel@
GhcMajVersion
=
@GhcMajVersion@
GhcMinVersion
=
@GhcMinVersion@
ghc_ge_605
=
YES
ghc_ge_607
=
YES
ghc_ge_609
=
YES
else
# not UseStage1 or BootingFromHc
# Some useful GHC version predicates:
ghc_ge_605
=
@ghc_ge_605@
ghc_ge_607
=
@ghc_ge_607@
ghc_ge_609
=
@ghc_ge_609@
...
...
utils/genapply/Makefile
View file @
f5817e0a
...
...
@@ -17,11 +17,7 @@ SRC_HC_OPTS += -package pretty
endif
# Try to get dependencies right...
ifeq
"$(ghc_ge_605)" "YES"
SRC_HC_OPTS
+=
-fforce-recomp
else
SRC_HC_OPTS
+=
-no-recomp
endif
GenApply.o
:
$(GHC_INCLUDE_DIR)/ghcconfig.h
GenApply.o
:
$(GHC_INCLUDE_DIR)/MachRegs.h
...
...
utils/nofib-analyse/Makefile
View file @
f5817e0a
...
...
@@ -8,9 +8,8 @@ ifeq "$(ghc_ge_607)" "YES"
SRC_HC_OPTS
+=
-package
containers
endif
ifeq
"$(ghc_ge_605)" "YES"
SRC_HC_OPTS
+=
-package
regex-compat
-package
html
endif
ifeq
"$(ghc_ge_607)" "YES"
SRC_HC_OPTS
+=
-package
containers
endif
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment