projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding hpc package to ghc core libraries
[ghc-hetmet.git]
/
libraries
/
Makefile
diff --git
a/libraries/Makefile
b/libraries/Makefile
index
6e4361c
..
a2b6545
100644
(file)
--- a/
libraries/Makefile
+++ b/
libraries/Makefile
@@
-61,6
+61,7
@@
SUBDIRS += $(wildcard mtl)
SUBDIRS += $(wildcard fgl)
SUBDIRS += $(wildcard X11)
SUBDIRS += $(wildcard time)
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.
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.
@@
-195,6
+196,12
@@
else
libsubdir = $$compiler/lib/$$pkgid
endif
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
$(foreach SUBDIR,$(SUBDIRS), \
stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).$(SUBDIR)): \
stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
@@
-211,7
+218,7
@@
stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
--datasubdir=ghc \
--haddock-args="--use-contents=../index.html \
--use-index=../doc-index.html" \
--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
--configure-option=--with-cc=$(CC) ) \
&& touch $@ || touch $*/unbuildable
# We don't touch $@ if configure failed as we would prefer to try
@@
-224,10
+231,7
@@
$(foreach SUBDIR,$(SUBDIRS),make.library.$(SUBDIR)):\
make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
%/GNUmakefile \
%/setup/Setup ifBuildable/ifBuildable
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)
ifBuildable/ifBuildable $* setup/Setup register --inplace
# Build the library using 'setup build' (not the default)