[project @ 2003-01-10 10:55:24 by simonmar]

Only add -package readline if $(GhcLibsWithReadline) == YES

This isn't really the correct solution, since we actually want to know
whether the bootstrapping compiler has readline, not this one, but
since the most common bootstrapping compiler is going to be the stage1
compiler in this tree it's a good guess that GhcLibsWithReadline is
correct.

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index ee0473c..982ac59 100644 (file)
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -277,7 +277,10 @@ ifeq "$(GhcWithInterpreter) $(bootstrapped)" "YES YES"
 # Yes, include the interepreter, readline, and Template Haskell extensions
 SRC_HC_OPTS += -DGHCI -package haskell-src
 ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 # Yes, include the interepreter, readline, and Template Haskell extensions
 SRC_HC_OPTS += -DGHCI -package haskell-src
 ifneq "$(TARGETPLATFORM)" "i386-unknown-mingw32"

-SRC_HC_OPTS += -package unix -package readline 
+SRC_HC_OPTS += -package unix
+ifeq "$(GhcLibsWithReadline)" "YES"
+SRC_HC_OPTS += -package readline 
+endif

 endif
 ALL_DIRS += ghci
 else
 endif
 ALL_DIRS += ghci
 else