SUBDIRS += $(wildcard fgl)
SUBDIRS += $(wildcard X11)
SUBDIRS += $(wildcard time)
+SUBDIRS += $(wildcard hpc)
ifeq "$(Windows)" "NO"
# HGL is not working on Win32, so omit it for now. Better not to ship it
# at all than to ship a broken version.
libsubdir = $$compiler/lib/$$pkgid
endif
+# We rely on all the CONFIGURE_ARGS being quoted with '...', and there
+# being no 's inside the values.
+FLAGGED_CONFIGURE_ARGS = $(subst $(space)',\
+ $(space)--configure-option=',\
+ $(space)$(CONFIGURE_ARGS))
+
$(foreach SUBDIR,$(SUBDIRS), \
stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \
stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
--prefix='$$topdir' \
--datadir='$$prefix/share' \
--libsubdir='$(libsubdir)' \
- --with-compiler=../../compiler/ghc-inplace$(dot_bat) \
- --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$(dot_bat) \
- --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace$(dot_bat) \
+ --with-compiler=../../compiler/stage1/ghc-inplace$ \
+ --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$ \
+ --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \
--with-ld=$(LD) \
--datasubdir=ghc \
--haddock-args="--use-contents=../index.html \
--use-index=../doc-index.html" \
- $(addprefix --configure-option=,$(CONFIGURE_ARGS)) \
+ $(FLAGGED_CONFIGURE_ARGS) \
--configure-option=--with-cc=$(CC) ) \
&& touch $@ || touch $*/unbuildable
# We don't touch $@ if configure failed as we would prefer to try
make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
%/GNUmakefile \
%/setup/Setup ifBuildable/ifBuildable
-# HACK: invoke make via $(SHELL), otherwise on Windows it apparently
-# gets argv[0] set to "make" (with quotes), which causes a problem
-# when make re-invokes itself after creating .depend. Ugh.
- ifBuildable/ifBuildable $* $(SHELL) -c $(MAKE)
+ ifBuildable/ifBuildable $* $(MAKE)
ifBuildable/ifBuildable $* setup/Setup register --inplace
# Build the library using 'setup build' (not the default)