projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2000-05-09 08:22:01 by rrt]
[ghc-hetmet.git]
/
mk
/
config.mk.in
diff --git
a/mk/config.mk.in
b/mk/config.mk.in
index
f18a1e7
..
d8fdf44
100644
(file)
--- a/
mk/config.mk.in
+++ b/
mk/config.mk.in
@@
-168,7
+168,7
@@
GhcCompilerWays=
#
# -dcore-lint check the types after every pass of the compiler;
# a pretty strong internal check
#
# -dcore-lint check the types after every pass of the compiler;
# a pretty strong internal check
-GhcHcOpts=
+GhcHcOpts=-O
# GhcWithHscBuiltViaC - build GHC compiler proper (\`hsc') from .hc files?
GhcWithHscBuiltViaC=@BootingFromHc@
# GhcWithHscBuiltViaC - build GHC compiler proper (\`hsc') from .hc files?
GhcWithHscBuiltViaC=@BootingFromHc@
@@
-216,11
+216,16
@@
endif
# things (incl "+") happens when compiling with this compiler
GhcLibHcOpts=-O
# things (incl "+") happens when compiling with this compiler
GhcLibHcOpts=-O
-SplitObjs = YES
# Win32 only: Enable the RTS and libraries to be built as DLLs
# Win32 only: Enable the RTS and libraries to be built as DLLs
-#
+# Don't split object files for libs if we're building DLLs
EnableWin32DLLs=@EnableWin32DLLs@
EnableWin32DLLs=@EnableWin32DLLs@
+ifeq "$(EnableWin32DLLs)" "YES"
+SplitObjs=NO
+else
+SplitObjs=YES
+endif
+
# Strip local symbols from libraries? This can make the libraries smaller,
# but makes debugging somewhat more difficult. Doesn't work with all ld's.
# Strip local symbols from libraries? This can make the libraries smaller,
# but makes debugging somewhat more difficult. Doesn't work with all ld's.
@@
-257,17
+262,22
@@
GhcRtsCcOpts=-O2 -optc-fomit-frame-pointer
HsLibsFor = ghc
# hslibs for GHC also uses the following variables (defined above):
HsLibsFor = ghc
# hslibs for GHC also uses the following variables (defined above):
-# GhcLibWays, GhcLibHcOpts, EnableWin32DLLs, StripLibraries
+# GhcLibWays, GhcLibHcOpts, GhcLibToolsHcOpts, EnableWin32DLLs, StripLibraries
+
+# Haskell compiler options for tools in hslibs
+GhcLibToolsHcOpts=-O
# Build the Haskell Readline bindings?
#
# Build the Haskell Readline bindings?
#
-GhcLibsWithReadline=NO
-#
+GhcLibsWithReadline=@HaveReadlineHeaders@
+
+# Libraries needed for linking with readline
+LibsReadline=@LibsReadline@
+
# Include path to readline.h
# (no path == in standard include path)
#
ReadlineIncludePath=
# Include path to readline.h
# (no path == in standard include path)
#
ReadlineIncludePath=
-HaveLibReadline=@HaveLibReadline@
################################################################################
#
################################################################################
#
@@
-632,14
+642,14
@@
YACC = @YaccCmd@
SGML2DVI = db2dvi
SGML2HTML = db2html
SGML2DVI = db2dvi
SGML2HTML = db2html
-SGML2INFO = db2info
+SGML2PS = db2ps
SGML2RTF = db2rtf
SGMLSTYLESHEET = $(FPTOOLS_TOP_ABS)/docs/fptools-both.dsl
SRC_SGML2DVI_OPTS = -d $(SGMLSTYLESHEET)
SRC_SGML2HTML_OPTS = -d $(SGMLSTYLESHEET)
SGML2RTF = db2rtf
SGMLSTYLESHEET = $(FPTOOLS_TOP_ABS)/docs/fptools-both.dsl
SRC_SGML2DVI_OPTS = -d $(SGMLSTYLESHEET)
SRC_SGML2HTML_OPTS = -d $(SGMLSTYLESHEET)
-SRC_SGML2INFO_OPTS = -d $(SGMLSTYLESHEET)
+SRC_SGML2PS_OPTS = -d $(SGMLSTYLESHEET)
SRC_SGML2RTF_OPTS = -d $(SGMLSTYLESHEET)
#-----------------------------------------------------------------------------
SRC_SGML2RTF_OPTS = -d $(SGMLSTYLESHEET)
#-----------------------------------------------------------------------------