diff options
| author | Ian Lynagh <igloo@earth.li> | 2008-08-10 00:28:07 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2008-08-10 00:28:07 +0000 |
| commit | 0f72a4c69215d1f81760aa0000ebbbfb2ac73303 (patch) | |
| tree | 4d6f42fcb1020d853e55c3d924f4e209d51650d4 | |
| parent | e07185eda0f37bd56ad876a2dfe73c956e432ffc (diff) | |
| download | haskell-0f72a4c69215d1f81760aa0000ebbbfb2ac73303.tar.gz | |
Use Cabal to build pwd
| -rw-r--r-- | utils/pwd/Makefile | 26 | ||||
| -rw-r--r-- | utils/pwd/Setup.hs | 2 | ||||
| -rw-r--r-- | utils/pwd/pwd.cabal | 24 |
3 files changed, 29 insertions, 23 deletions
diff --git a/utils/pwd/Makefile b/utils/pwd/Makefile index 0935a64d1d..53a62f0dc3 100644 --- a/utils/pwd/Makefile +++ b/utils/pwd/Makefile @@ -1,26 +1,6 @@ TOP=../.. -include $(TOP)/mk/boilerplate.mk - -# Beyond stage 1, honour any Mac OS X depolyment target options. If we use -# these options in stage 1 we get a linker error if the bootstrap compiler is -# for a more recent OS version -ifeq "$(stage)" "2" -SRC_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS) -SRC_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS)) -SRC_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS)) -endif +EXTRA_CLEAN = pwd pwd.exe -# We have two version: the inplace version compiled by the bootstrap compiler -# and the install version compiled by the stage 1 compiler -ifeq "$(stage)" "2" -HS_PROG = pwd -else -HS_PROG = pwd-inplace -endif - -binary-dist: - $(INSTALL_DIR) $(BIN_DIST_DIR)/utils/pwd - $(INSTALL_DATA) Makefile $(BIN_DIST_DIR)/utils/pwd/ - $(INSTALL_PROGRAM) pwd$(exeext) $(BIN_DIST_DIR)/utils/pwd/ +include $(TOP)/mk/boilerplate.mk +include $(TOP)/mk/cabal.mk -include $(TOP)/mk/target.mk diff --git a/utils/pwd/Setup.hs b/utils/pwd/Setup.hs new file mode 100644 index 0000000000..9a994af677 --- /dev/null +++ b/utils/pwd/Setup.hs @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain diff --git a/utils/pwd/pwd.cabal b/utils/pwd/pwd.cabal new file mode 100644 index 0000000000..5422a734ee --- /dev/null +++ b/utils/pwd/pwd.cabal @@ -0,0 +1,24 @@ +Name: pwd +Version: 0.1 +Copyright: XXX +License: BSD +-- XXX License-File: LICENSE +-- XXX Author: +-- XXX Maintainer: +Synopsis: XXX +Description: + XXX +build-type: Simple +cabal-version: >=1.2 + +Flag base3 + Description: Choose the new smaller, split-up base package. + +Executable pwd + Main-Is: pwd.hs + if flag(base3) + Build-Depends: base >= 3 && < 4, + directory >= 1 && < 1.1 + else + Build-Depends: base < 3 + |