projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Eliminate external GMP dependencies
[ghc-hetmet.git]
/
libraries
/
Makefile
diff --git
a/libraries/Makefile
b/libraries/Makefile
index
bbcfdd2
..
51cb7aa
100644
(file)
--- a/
libraries/Makefile
+++ b/
libraries/Makefile
@@
-171,15
+171,28
@@
installPackage/installPackage: installPackage.hs $(BOOTSTRAP_STAMPS)
-$(RM) -rf installPackage
mkdir installPackage
$(CP) installPackage.hs installPackage/
-$(RM) -rf installPackage
mkdir installPackage
$(CP) installPackage.hs installPackage/
+ifeq "$(UseStage1)" "YES"
+ cd installPackage && ../$(HC) -Wall -cpp \
+ --make installPackage -o installPackage \
+ $(BOOTSTRAP_INC_1_UP)
+else
cd installPackage && $(GHC) -Wall -cpp \
--make installPackage -o installPackage \
$(BOOTSTRAP_INC_1_UP)
cd installPackage && $(GHC) -Wall -cpp \
--make installPackage -o installPackage \
$(BOOTSTRAP_INC_1_UP)
+endif
+# TODO: The conditional is yucky, but we need to be able to build with stage1
+# for bindists and as installPackages/ has no Makefile, it seems hard
+# to make this nicer.
ifBuildable/ifBuildable: ifBuildable.hs
-$(RM) -rf ifBuildable
mkdir ifBuildable
$(CP) ifBuildable.hs ifBuildable/
ifBuildable/ifBuildable: ifBuildable.hs
-$(RM) -rf ifBuildable
mkdir ifBuildable
$(CP) ifBuildable.hs ifBuildable/
+ifeq "$(UseStage1)" "YES"
+ cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable
+else
cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable
cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable
+endif
$(BOOTSTRAP_STAMPS): stamp/bootstrapping.%:
$(RM) -rf bootstrapping.$*
$(BOOTSTRAP_STAMPS): stamp/bootstrapping.%:
$(RM) -rf bootstrapping.$*
@@
-268,7
+281,7
@@
make.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
setup/Setup makefile -f GNUmakefile; \
cmp -s GNUmakefile GNUmakefile.tmp && mv GNUmakefile.tmp GNUmakefile; \
$(MAKE) $(MFLAGS) && \
setup/Setup makefile -f GNUmakefile; \
cmp -s GNUmakefile GNUmakefile.tmp && mv GNUmakefile.tmp GNUmakefile; \
$(MAKE) $(MFLAGS) && \
- setup/Setup register --inplace; \
+ ../installPackage/installPackage register --inplace; \
fi
# Build the library using 'setup build' (not the default)
fi
# Build the library using 'setup build' (not the default)
@@
-359,7
+372,7
@@
$(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
install.library.%: installPackage/installPackage ifBuildable/ifBuildable
if ifBuildable/ifBuildable $*; then \
cd $* && \
install.library.%: installPackage/installPackage ifBuildable/ifBuildable
if ifBuildable/ifBuildable $*; then \
cd $* && \
- ../installPackage/installPackage '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(iinterfacedir)' ; \
+ ../installPackage/installPackage install '$(GHC_PKG_PROG)' '$(DESTDIR)$(libdir)/package.conf' '$(DESTDIR)' '$(prefix)' '$(iprefix)' '$(ibindir)' '$(ilibdir)' '$(ilibexecdir)' '$(idatadir)' '$(idocdir)' '$(ihtmldir)' '$(iinterfacedir)' ; \
fi
.PHONY: binary-dist binary-dist.library.%
fi
.PHONY: binary-dist binary-dist.library.%