Tue Apr 24 14:31:27 PDT 2007 Ian Lynagh <[EMAIL PROTECTED]>
* Add extra libraries when compiling with GHC on Windows
thanks, that seems to have fixed the main build, modulo ALUT setup.
and i can start 'compiler/stage2/ghc-inplace --interactive' just fine.
but now, 'make binary-dist' complains that it can't copy the things that
weren't built, and indeed, 'libraries/Makefile' seems to have hardcoded
'SUBDIRS'. the libraries subdirs show variation wrt *.buildinfo existence,
so i'm simply checking for existence of dist/, which is sufficient to skip
just ALUT/:
$ darcs whatsnew
plink: unknown option "-O"
{
hunk ./Makefile 389
- $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$*/setup
- cp libraries/$*/setup/Setup $(BIN_DIST_LIBDIR)/$*/setup
- cp libraries/$*/*.cabal $(BIN_DIST_LIBDIR)/$*
- cp -a libraries/$*/dist $(BIN_DIST_LIBDIR)/$*
- find $(BIN_DIST_LIBDIR)/$*/dist \
- \( \( -name "*.o" -o -name "*.p_o" \) -a \! -name "HS*" \) \
- -exec rm {} \;
+ if test -d libraries/$*/dist; then \
+ $(MKDIRHIER) $(BIN_DIST_LIBDIR)/$*/setup; \
+ cp libraries/$*/setup/Setup $(BIN_DIST_LIBDIR)/$*/setup; \
+ cp libraries/$*/*.cabal $(BIN_DIST_LIBDIR)/$*; \
+ cp -a libraries/$*/dist $(BIN_DIST_LIBDIR)/$*; \
+ find $(BIN_DIST_LIBDIR)/$*/dist \
+ \( \( -name "*.o" -o -name "*.p_o" \) -a \! -name "HS*" \)
\
+ -exec rm {} \; ; \
+ else \
+ echo "skipping libraries/$* (no dist/ dir)"; \
+ fi
}
with that, 'make binary-dist' seems to go through as well. but now, i can't
use the ghci in the distribution, which seems to be rather incomplete:
$ ghc-6.7.20070423/bin/ghcii.sh
___ ___ _
/ _ \ /\ /\/ __(_)
/ /_\// /_/ / / | | GHC Interactive, version 6.7.20070423, for
Haskell 98.
/ /_\\/ __ / /___| | http://www.haskell.org/ghc/
\____/\/ /_/\____/|_| Type :? for help.
<interactive>:1:22:
Failed to load interface for `System.IO':
it is not a module in the current program, or in any known package.
ghc.exe: panic! (the 'impossible' happened)
(GHC version 6.7.20070423 for i386-unknown-mingw32):
interactiveUI:setBuffering
Please report this as a GHC bug: http://www.haskell.org/ghc/reportabug
$ ghc-6.7.20070423/bin/ghc-pkg.exe list
c:/fptools/ghc/ghc-6.7.20070423\package.conf:
{ghc-6.7.20070423}, rts-1.0
shouldn't stuff be copied from ghc-<version>/libraries/<lib>/dist/* into the
ghc-<version> main directory, including docs and package registrations?
getting closer, though;-)
claus
_______________________________________________
Cvs-libraries mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-libraries
