projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2001-04-20 10:56:12 by michaelw]
[ghc-hetmet.git]
/
mk
/
config.mk.in
diff --git
a/mk/config.mk.in
b/mk/config.mk.in
index
dc252ee
..
1691db4
100644
(file)
--- a/
mk/config.mk.in
+++ b/
mk/config.mk.in
@@
-192,7
+192,7
@@
HaveLibDL = @HaveLibDL@
# Include GHCi in the compiler. Default to NO for the time being.
# Include GHCi in the compiler. Default to NO for the time being.
-ifneq "$(findstring $(HostOS_CPP), linux solaris freebsd netbsd openbsd)" ""
+ifneq "$(findstring $(HostOS_CPP), linux solaris2 freebsd netbsd openbsd)" ""
GhcWithInterpreter=YES
ifeq "$(HaveLibDL)" "YES"
SRC_HC_OPTS += -ldl
GhcWithInterpreter=YES
ifeq "$(HaveLibDL)" "YES"
SRC_HC_OPTS += -ldl
@@
-401,14
+401,13
@@
endif
# FPTOOLS_TOP: the top of the fptools hierarchy, absolute path.
# FPTOOLS_TOP: the top of the fptools hierarchy, absolute path.
+ifeq "$(findstring $(TARGETPLATFORM), i386-unknown-cygwin32 i386-unknown-mingw32)" ""
FPTOOLS_TOP_ABS = @hardtop@
FPTOOLS_TOP_ABS = @hardtop@
-FPTOOLS_TOP_ABS_UNIX = @hardtop@
-ifeq "$(TARGETPLATFORM)" "i386-unknown-cygwin32"
-FPTOOLS_TOP_ABS = $(subst \,/,$(shell cygpath -w @hardtop@))
-endif
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
+else
FPTOOLS_TOP_ABS = $(subst \,/,$(shell cygpath -w @hardtop@))
endif
FPTOOLS_TOP_ABS = $(subst \,/,$(shell cygpath -w @hardtop@))
endif
+# Keep the Unix-style path to use with Unix tools (e.g. in ghc-inplace script)
+FPTOOLS_TOP_ABS_UNIX = @hardtop@
#
# Installation directories, we don't use half of these,
#
# Installation directories, we don't use half of these,