diff options
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/build-package-data.mk | 2 | ||||
| -rw-r--r-- | rules/build-package-way.mk | 81 | ||||
| -rw-r--r-- | rules/build-package.mk | 2 | ||||
| -rw-r--r-- | rules/distdir-way-opts.mk | 18 | ||||
| -rw-r--r-- | rules/haddock.mk | 1 | ||||
| -rw-r--r-- | rules/sdist-ghc-file.mk | 31 | ||||
| -rw-r--r-- | rules/shell-wrapper.mk | 6 |
7 files changed, 62 insertions, 79 deletions
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index 04364b781e..2f0d7c9f2a 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -125,7 +125,7 @@ ifneq "$$($1_NO_CHECK)" "YES" "$$(ghc-cabal_INPLACE)" check $1 endif endif - "$$(ghc-cabal_INPLACE)" configure $1 $2 "$$($1_$2_dll0_MODULES)" --with-ghc="$$($1_$2_HC_CONFIG)" --with-ghc-pkg="$$($1_$2_GHC_PKG)" $$($1_CONFIGURE_OPTS) $$($1_$2_CONFIGURE_OPTS) + "$$(ghc-cabal_INPLACE)" configure $1 $2 --with-ghc="$$($1_$2_HC_CONFIG)" --with-ghc-pkg="$$($1_$2_GHC_PKG)" $$($1_CONFIGURE_OPTS) $$($1_$2_CONFIGURE_OPTS) ifeq "$$($1_$2_PROG)" "" $$(call cmd,$1_$2_GHC_PKG) update -v0 --force $$($1_$2_GHC_PKG_OPTS) $1/$2/inplace-pkg-config endif diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk index 3b4d1c926c..8d14b7a3e2 100644 --- a/rules/build-package-way.mk +++ b/rules/build-package-way.mk @@ -23,18 +23,10 @@ $(call hs-objs,$1,$2,$3) # The .a/.so library file, indexed by two different sets of vars: # the first is indexed by the dir, distdir and way # the second is indexed by the package id, distdir and way -$1_$2_$3_LIB_FILE = libHS$$($1_$2_COMPONENT_ID)$$($3_libsuf) +$1_$2_$3_LIB_FILE = libHS$$($1_$2_COMPONENT_ID)$(subst .,%,$$($3_libsuf)) $1_$2_$3_LIB = $1/$2/build/$$($1_$2_$3_LIB_FILE) $$($1_$2_COMPONENT_ID)_$2_$3_LIB = $$($1_$2_$3_LIB) -ifeq "$$(TargetOS_CPP)" "mingw32" -ifneq "$$($1_$2_dll0_HS_OBJS)" "" -$1_$2_$3_LIB0_ROOT = HS$$($1_$2_COMPONENT_ID)-0$$($3_libsuf) -$1_$2_$3_LIB0_NAME = lib$$($1_$2_$3_LIB0_ROOT) -$1_$2_$3_LIB0 = $1/$2/build/$$($1_$2_$3_LIB0_NAME) -endif -endif - # Note [inconsistent distdirs] # # hack: the DEPS_LIBS mechanism assumes that the distdirs for packages @@ -62,32 +54,11 @@ $1_$2_$3_ALL_OBJS = $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_NON_HS_OBJS) ifeq "$3" "dyn" -ifneq "$$($1_$2_dll0_MODULES)" "" -$$($1_$2_$3_LIB) : $1/$2/dll-split.stamp -ifneq "$$($1_$2_$3_LIB0)" "" -$$($1_$2_$3_LIB0) : $1/$2/dll-split.stamp -endif -endif - -$1/$2/dll-split.stamp: $$($1_$2_depfile_haskell) $$$$(dll-split_INPLACE) - $$(dll-split_INPLACE) $$< "$$($1_$2_dll0_START_MODULE)" "$$($1_$2_dll0_MODULES)" - touch $$@ - # Link a dynamic library # On windows we have to supply the extra libs this one links to when building it. ifeq "$$(TargetOS_CPP)" "mingw32" $$($1_$2_$3_LIB) : $$($1_$2_$3_ALL_OBJS) $$(ALL_RTS_LIBS) $$($1_$2_$3_DEPS_LIBS) -ifneq "$$($1_$2_$3_LIB0)" "" - $$(call build-dll,$1,$2,$3,-L$1/$2/build -l$$($1_$2_$3_LIB0_ROOT),$$(filter-out $$($1_$2_dll0_HS_OBJS),$$($1_$2_$3_HS_OBJS)) $$($1_$2_$3_NON_HS_OBJS),$$@) -else - $$(call build-dll,$1,$2,$3,,$$($1_$2_$3_HS_OBJS) $$($1_$2_$3_NON_HS_OBJS),$$@) -endif - -ifneq "$$($1_$2_$3_LIB0)" "" -$$($1_$2_$3_LIB) : $$($1_$2_$3_LIB0) -$$($1_$2_$3_LIB0) : $$($1_$2_$3_ALL_OBJS) $$(ALL_RTS_LIBS) $$($1_$2_$3_DEPS_LIBS) - $$(call build-dll,$1,$2,$3,,$$($1_$2_dll0_HS_OBJS) $$($1_$2_$3_NON_HS_OBJS),$$($1_$2_$3_LIB0)) -endif + $$(call build-dll,$1,$2,$3,-L$1/$2/build,,$$($1_$2_$3_HS_OBJS) $$($1_$2_$3_NON_HS_OBJS),"$$@","NO","$$($1_PACKAGE)","$$($1_$2_VERSION)") else # ifneq "$$(TargetOS_CPP)" "mingw32" $$($1_$2_$3_LIB) : $$($1_$2_$3_ALL_OBJS) $$(ALL_RTS_LIBS) $$($1_$2_$3_DEPS_LIBS) @@ -116,14 +87,6 @@ else endif $$(call removeFiles,$$@.contents) -ifeq "$$(TargetOS_CPP)" "mingw32" -ifneq "$$($1_$2_$3_LIB0)" "" -$$($1_$2_$3_LIB) : $$($1_$2_$3_LIB0) -$$($1_$2_$3_LIB0) : - $$(call cmd,$1_$2_AR) $$($1_$2_AR_OPTS) $$($1_$2_EXTRA_AR_ARGS) $$@ -endif -endif - endif # "$3" "dyn" $(call all-target,$1_$2,all_$1_$2_$3) @@ -133,7 +96,7 @@ $(call all-target,$1_$2_$3,$$($1_$2_$3_LIB)) ifneq "$4" "0" BINDIST_HI += $$($1_$2_$3_HI) BINDIST_LIBS += $$($1_$2_$3_LIB) -BINDIST_LIBS += $$($1_$2_$3_LIB0) +# Need to put the split libs and import libraries here endif ifeq "$$($1_$2_SplitSections)" "YES" @@ -158,8 +121,11 @@ BINDIST_LIBS += $$($1_$2_GHCI_LIB) endif endif $$($1_$2_GHCI_LIB) : $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) $$($1_$2_EXTRA_OBJS) $$($1_$2_LD_SCRIPT) - $$(call cmd,LD) $$(CONF_LD_LINKER_OPTS_STAGE$4) -r $$(if $$($1_$2_LD_SCRIPT),$$($1_$2_LD_SCRIPT_CMD) $$($1_$2_LD_SCRIPT)) -o $$@ $$(EXTRA_LD_LINKER_OPTS) $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) $$($1_$2_EXTRA_OBJS) - + $$(call cmd,LD_NO_GOLD) $$(CONF_LD_LINKER_OPTS_STAGE$4) -r $$(if $$($1_$2_LD_SCRIPT),$$($1_$2_LD_SCRIPT_CMD) $$($1_$2_LD_SCRIPT)) -o $$@ $$(EXTRA_LD_LINKER_OPTS) $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS) $$($1_$2_$3_S_OBJS) $$($1_$2_EXTRA_OBJS) +# NB. LD_NO_GOLD above: see #14328 (symptoms: #14675,#14291). At least +# some versions of ld.gold appear to have a bug that causes the +# generated GHCi library to have some bogus relocations. Performance +# isn't critical here, so we fall back to the ordinary ld. ifeq "$$($1_$2_BUILD_GHCI_LIB)" "YES" # Don't bother making ghci libs for bootstrapping packages ifneq "$4" "0" @@ -171,20 +137,23 @@ endif # "$3" "v" $(call profEnd, build-package-way($1,$2,$3)) endef # build-package-way -# $1 = dir -# $2 = distdir -# $3 = way -# $4 = extra flags -# $5 = object files to link -# $6 = output filename define build-dll - $(call cmd,$1_$2_HC) $($1_$2_$3_ALL_HC_OPTS) $($1_$2_$3_GHC_LD_OPTS) $4 $5 \ - -shared -dynamic -dynload deploy \ - $(addprefix -l,$($1_$2_EXTRA_LIBRARIES)) \ - -no-auto-link-packages \ - -o $6 -# Now check that the DLL doesn't have too many symbols. See trac #5987. - SYMBOLS=`$(OBJDUMP) -p $6 | sed -n "1,/^.Ordinal\/Name Pointer/ D; p; /^$$/ q" | tail -n +2 | wc -l`; echo "Number of symbols in $6: $$SYMBOLS" - case `$(OBJDUMP) -p $6 | sed -n "1,/^.Ordinal\/Name Pointer/ D; p; /^$$/ q" | grep "\[ *0\]" | wc -l` in 1) echo DLL $6 OK;; 0) echo No symbols in DLL $6; exit 1;; [0-9]*) echo Too many symbols in DLL $6; $(OBJDUMP) -p $6 | sed -n "1,/^.Ordinal\/Name Pointer/ D; p; /^$$/ q" | tail; exit 1;; *) echo bad DLL $6; exit 1;; esac +# Call out to the shell script to decide how to build the util dll. +# 1 = dir +# 2 = distdir +# 3 = way +# 4 = extra flags +# 5 = extra libraries to link +# 6 = object files to link +# 7 = output filename +# 8 = link command +# 9 = create delay load import lib +# 10 = SxS Name +# 11 = SxS Version +$(gen-dll_INPLACE) link "$1" "$2" "$3" "$4" "$5" "$6" "$7" "$(call cmd,$1_$2_HC) $(subst -no-hs-main,,$($1_$2_$3_ALL_HC_OPTS) $($1_$2_$3_GHC_LD_OPTS)) \ + -shared -dynamic -dynload deploy \ + $(addprefix -l,$($1_$2_EXTRA_LIBRARIES)) \ + -no-auto-link-packages" "$8" \ + "$9" "${10}" endef diff --git a/rules/build-package.mk b/rules/build-package.mk index fb04f02f27..c29155c582 100644 --- a/rules/build-package.mk +++ b/rules/build-package.mk @@ -155,7 +155,7 @@ endif # Don't put bootstrapping packages in the bindist ifneq "$3" "0" -BINDIST_EXTRAS += $1/*.cabal $$(wildcard $1/*.buildinfo) $1/$2/setup-config $1/LICENSE +BINDIST_EXTRAS += $1/*.cabal $$(wildcard $1/*.buildinfo) $$(wildcard $1/dist-install/build/*.buildinfo) $1/$2/setup-config $1/LICENSE BINDIST_EXTRAS += $$($1_$2_INSTALL_INCLUDES_SRCS) endif diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk index eb4a5c420c..45dc0ce988 100644 --- a/rules/distdir-way-opts.mk +++ b/rules/distdir-way-opts.mk @@ -105,20 +105,10 @@ define distdir-way-opts # args: $1 = dir, $2 = distdir, $3 = way, $4 = stage # $1_$2_$3_MOST_HC_OPTS is also passed to C compilations when we use # GHC as the C compiler. -ifeq "$(SUPPORTS_THIS_UNIT_ID)" "NO" -ifeq "$4" "0" -$4_USE_THIS_UNIT_ID=NO -endif -endif - $1_$2_$4_DEP_OPTS = \ $$(foreach pkg,$$($1_$2_DEP_IPIDS),-package-id $$(pkg)) -ifeq "$($4_USE_THIS_UNIT_ID)" "NO" -$4_THIS_UNIT_ID = -this-package-key -else $4_THIS_UNIT_ID = -this-unit-id -endif $1_$2_$3_MOST_HC_OPTS = \ $$(WAY_$3_HC_OPTS) \ @@ -177,14 +167,6 @@ $1_$2_$3_ALL_HC_OPTS = \ $$(if $$(findstring YES,$$($1_$2_SplitSections)),$$(if $$(findstring dyn,$3),,-split-sections),) \ $$(if $$(findstring YES,$$($1_$2_DYNAMIC_TOO)),$$(if $$(findstring v,$3),-dynamic-too)) -ifeq "$3" "dyn" -ifeq "$$(HostOS_CPP)" "mingw32" -ifneq "$$($1_$2_dll0_MODULES)" "" -$1_$2_$3_ALL_HC_OPTS += -dll-split $1/$2/dll-split -endif -endif -endif - $1_$2_$3_ALL_CC_OPTS = \ $$(WAY_$3_CC_OPTS) \ $$($1_$2_DIST_GCC_CC_OPTS) \ diff --git a/rules/haddock.mk b/rules/haddock.mk index 35748c3f00..37182bcbe6 100644 --- a/rules/haddock.mk +++ b/rules/haddock.mk @@ -65,6 +65,7 @@ endif --dump-interface=$$($$($1_PACKAGE)-$$($1_$2_VERSION)_HADDOCK_FILE) \ --html \ --hoogle \ + --quickjump \ --title="$$($1_PACKAGE)-$$($1_$2_VERSION)$$(if $$(strip $$($1_$2_SYNOPSIS)),: $$(strip $$($1_$2_SYNOPSIS)),)" \ --prologue="$1/$2/haddock-prologue.txt" \ --optghc="-D__HADDOCK_VERSION__=$$(HADDOCK_VERSION_STRING)" \ diff --git a/rules/sdist-ghc-file.mk b/rules/sdist-ghc-file.mk index 9ea0b6521a..d6a70e10fb 100644 --- a/rules/sdist-ghc-file.mk +++ b/rules/sdist-ghc-file.mk @@ -44,3 +44,34 @@ sdist_$1_$2_$4 : $1/$2/build/$4.hs # didn't generate all package-data.mk files. $$(eval $$(call hs-suffix-rules-srcdir,$1,$2,$3)) endef + +# ----------------------------------------------------------------------------- +# Variant of sdist-ghc-file whose `$3`-argument is interpreted +# differently in a more appropriate way for cabal-packages + +define sdist-ghc-file2 +# $1 = dir +# $2 = distdir +# $3 = moduledir +# $4 = filename +# $5 = extension + +.PHONY: sdist_$1_$2_$4 + +# We should do this before creating the `sdist-ghc` tarball, or when just +# running `make sdist-ghc-prep`. +sdist-ghc-prep : sdist_$1_$2_$4 + +# But first create SRC_DIST_GHC_DIR. +sdist_$1_$2_$4 : sdist-ghc-prep-tree + +# Generate the .hs files if they don't exist yet, then do actual copying and +# moving. +sdist_$1_$2_$4 : $1/$2/build/$3/$4.hs + "$(CP)" $1/$2/build/$3/$4.hs $(SRC_DIST_GHC_DIR)/$1/$3 + mv $(SRC_DIST_GHC_DIR)/$1/$3/$4.$5 $(SRC_DIST_GHC_DIR)/$1/$3/$4.$5.source + +# And make sure the rules for generating the .hs files exist, even when we +# didn't generate all package-data.mk files. +$$(eval $$(call hs-suffix-rules-srcdir,$1,$2,$3)) +endef diff --git a/rules/shell-wrapper.mk b/rules/shell-wrapper.mk index eb7d8f13ab..bdab6e289d 100644 --- a/rules/shell-wrapper.mk +++ b/rules/shell-wrapper.mk @@ -41,7 +41,7 @@ $$($1_$2_INPLACE_WRAPPER): $$($1_$2_SHELL_WRAPPER_NAME) endif $$($1_$2_INPLACE_WRAPPER): $$($1_$2_INPLACE) $$(call removeFiles, $$@) - echo '#!$$(SHELL)' >> $$@ + echo '#!/bin/sh' >> $$@ echo 'executablename="$$(TOP)/$$<"' >> $$@ echo 'datadir="$$(TOP)/$$(INPLACE_LIB)"' >> $$@ echo 'bindir="$$(TOP)/$$(INPLACE_BIN)"' >> $$@ @@ -80,7 +80,7 @@ install_$1_$2_wrapper: $$(INSTALL_DIR) "$$(DESTDIR)$$(bindir)" $$(call removeFiles, "$$(WRAPPER)") $$(CREATE_SCRIPT) "$$(WRAPPER)" - echo '#!$$(SHELL)' >> "$$(WRAPPER)" + echo '#!/bin/sh' >> "$$(WRAPPER)" echo 'exedir="$$(ghclibexecdir)/bin"' >> "$$(WRAPPER)" echo 'exeprog="$$($1_$2_PROG)"' >> "$$(WRAPPER)" echo 'executablename="$$$$exedir/$$$$exeprog"' >> "$$(WRAPPER)" @@ -106,7 +106,7 @@ BINDIST_EXTRAS += $$($1_$2_BINDIST_WRAPPER) $$($1_$2_BINDIST_WRAPPER): $1/$2/build/tmp/$$($1_$2_PROG) $$(call removeFiles, $$@) - echo '#!$$(SHELL)' >> $$@ + echo '#!/bin/sh' >> $$@ ifeq "$$(DYNAMIC_GHC_PROGRAMS)" "YES" echo '$$(call prependLibraryPath,$$($1_$2_DEP_LIB_REL_DIRS_SEARCHPATH))' >> $$@ endif |