X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=mk%2Fcabal.mk;h=8c486a982e1f476cb8e59aa58dc97d9399e63be2;hb=4a73af53332e94ca56a6faed96f8391c14ecfa18;hp=079f8033ca1fe3c8038e48fe44e70aaea89fbab4;hpb=c35325dd60a671e6e7fcc513fc3ae02586106c4c;p=ghc-hetmet.git diff --git a/mk/cabal.mk b/mk/cabal.mk index 079f803..8c486a9 100644 --- a/mk/cabal.mk +++ b/mk/cabal.mk @@ -14,14 +14,14 @@ INSTALL_FLAGS = endif endif -# Tell stage1 to make a dynamically-linked binary, but no wrapper. We assume +# Tell stage2 to make a dynamically-linked binary, but no wrapper. We assume # that in an installation the shared libs will be installed somewhere that # the system can find them. ifeq "$(BuildSharedLibs)" "YES" DYN_FLAGS = --ghc-option=-dynamic --ghc-option=-dynload --ghc-option=deploy endif -.PHONY: default all with-bootstrapping-compiler with-stage-1 clean distclean +.PHONY: default all with-bootstrapping-compiler with-stage-2 clean distclean default all: with-bootstrapping-compiler @@ -34,12 +34,12 @@ with-bootstrapping-compiler: $(CABAL) build --distpref dist-inplace $(BUILD_FLAGS) $(CABAL) install --distpref dist-inplace $(INSTALL_FLAGS) -with-stage-1: +with-stage-2: $(CABAL) configure --distpref dist-install \ $(INSTALL_DIRS_CONFIGURE_FLAGS) \ - $(USE_STAGE1_CONFIGURE_FLAGS) \ + $(USE_STAGE2_CONFIGURE_FLAGS) \ $(COMMON_CONFIGURE_FLAGS) \ - $(EXTRA_STAGE1_CONFIGURE_FLAGS) + $(EXTRA_STAGE2_CONFIGURE_FLAGS) $(CABAL) build --distpref dist-install $(DYN_FLAGS) $(BUILD_FLAGS) install: