diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-09-13 16:19:45 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-09-13 16:19:45 +0000 |
| commit | 354503a27a016b2cc030b7fae5d007b0259c77d2 (patch) | |
| tree | 47af357660535109be61e1b4fcd922a92b9881d2 /rules/build-package-data.mk | |
| parent | d210b148c72c7fa97e87214d38608ef011657271 (diff) | |
| download | haskell-354503a27a016b2cc030b7fae5d007b0259c77d2.tar.gz | |
Don't register the non-munged stage1 ghc package
It confuses the build system.
Diffstat (limited to 'rules/build-package-data.mk')
| -rw-r--r-- | rules/build-package-data.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index 81913dcc87..4fe60f9818 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -48,12 +48,14 @@ endif $1/$2/package-data.mk $1/$2/inplace-pkg-config $1/$2/build/autogen/cabal_macros.h : $$(GHC_CABAL_INPLACE) $$($1_$2_GHC_PKG_DEP) $1/$$($1_PACKAGE).cabal $$(wildcard $1/configure) $$($1_$2_HC_CONFIG_DEP) "$$(GHC_CABAL_INPLACE)" configure --with-ghc="$$($1_$2_HC_CONFIG)" --with-ghc-pkg="$$($1_$2_GHC_PKG)" --with-gcc="$$(WhatGccIsCalled)" --configure-option=--with-cc="$$(WhatGccIsCalled)" $$($1_CONFIGURE_OPTS) $$($1_$2_CONFIGURE_OPTS) -- $2 $1 ifeq "$$($1_$2_PROG)" "" +ifneq "$$($1_$2_REGISTER_PACKAGE)" "NO" ifeq "$$(ghc_ge_6102) $3" "NO 0" # NOTE [1] below cat $1/$2/inplace-pkg-config | sed "s@^import-dirs:@import-dirs: $(TOP)/$1 $(TOP)/$1/src @" | "$$($1_$2_GHC_PKG)" update --force $$($1_$2_GHC_PKG_OPTS) - else "$$($1_$2_GHC_PKG)" update --force $$($1_$2_GHC_PKG_OPTS) $1/$2/inplace-pkg-config endif endif +endif # [1] this is a hack for GHC <= 6.10.1. When making dependencies with # ghc -M, in GHC 6.10.1 and earlier, GHC needed to find either the .hi |