diff options
| author | Manuel M T Chakravarty <chak@cse.unsw.edu.au> | 2007-12-17 09:38:39 +0000 |
|---|---|---|
| committer | Manuel M T Chakravarty <chak@cse.unsw.edu.au> | 2007-12-17 09:38:39 +0000 |
| commit | a9f9a7544a9605d0af16adf79abdfe8d99b0bb3d (patch) | |
| tree | 2cf5b967e0440326fa763aeb7f60ffcb335b8eb2 /libraries | |
| parent | 982bcefaed87d338adb27433d7b8c1655946a9d1 (diff) | |
| download | haskell-a9f9a7544a9605d0af16adf79abdfe8d99b0bb3d.tar.gz | |
Eliminate external GMP dependencies
- Ensure the stage1 compiler uses ghc's own GMP library on Mac OS
- Need to rebuild installPackage and ifBuildable with stage1 compiler as they
go into bindists
Diffstat (limited to 'libraries')
| -rw-r--r-- | libraries/Makefile | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/libraries/Makefile b/libraries/Makefile index 9b61df22b8..51cb7aadcb 100644 --- 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/ +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) +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/ +ifeq "$(UseStage1)" "YES" + cd ifBuildable && ../$(HC) -Wall --make ifBuildable -o ifBuildable +else cd ifBuildable && $(GHC) -Wall --make ifBuildable -o ifBuildable +endif $(BOOTSTRAP_STAMPS): stamp/bootstrapping.%: $(RM) -rf bootstrapping.$* |