diff options
| author | Ben Gamari <bgamari.foss@gmail.com> | 2016-11-04 15:03:44 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-11-10 13:16:03 -0500 |
| commit | 816d2e415a32651ed6876c19adb6d33b94c08864 (patch) | |
| tree | c0125de427aac43145c78c69af10f17608eb0096 /rules | |
| parent | 500d90d2ec841453a2b4162307ea706aa2cb5b1e (diff) | |
| download | haskell-816d2e415a32651ed6876c19adb6d33b94c08864.tar.gz | |
build system: Include CONF_LD_LINKER_OPTS in ALL_LD_OPTS
This ensures that artifacts built with build-prog see these options.
Also spruce up comments.
Test Plan: Carefully read it.
Reviewers: austin, hvr, erikd
Reviewed By: erikd
Subscribers: thomie, erikd
Differential Revision: https://phabricator.haskell.org/D2673
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/distdir-way-opts.mk | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk index 31329f5826..6ae9807944 100644 --- a/rules/distdir-way-opts.mk +++ b/rules/distdir-way-opts.mk @@ -30,13 +30,22 @@ define distdir-way-opts # args: $1 = dir, $2 = distdir, $3 = way, $4 = stage # Variable Purpose Defined by # -------------- ------------------------------ -------------- # $1_PACKAGE Package name for this dir, $1/$2/ghc.mk -# if it is a package -# +# if it is a package +# # CONF_HC_OPTS GHC options from ./configure mk/config.mk.in -# +# +# CONF_CPP_OPTS_STAGE$4 CPP options from ./configure mk/config.mk.in +# +# CONF_CC_OPTS_STAGE$4 C compiler options from mk/config.mk.in +# ./configure +# # CONF_HC_OPTS_STAGE$4 GHC options from ./configure mk/config.mk.in -# specific to stage $4 -# +# specific to stage $4 +# +# CONF_LD_LINKER_OPTS_STAGE$4 +# GHC options from ./configure mk/config.mk.in +# specific to stage $4 +# # WAY_$3_HC_OPTS GHC options specific to way $3 mk/ways.mk # # SRC_HC_OPTS source-tree-wide GHC options mk/config.mk.in @@ -82,7 +91,7 @@ define distdir-way-opts # args: $1 = dir, $2 = distdir, $3 = way, $4 = stage # source files # # $1_$2_CPP_OPTS CPP options $1/$2/package-data.mk -# +# # <file>_HC_OPTS GHC options for this source $1/$2/ghc.mk # file (without the extension) @@ -193,7 +202,8 @@ $1_$2_$3_ALL_LD_OPTS = \ $$($1_$2_DIST_LD_OPTS) \ $$($1_$2_$3_LD_OPTS) \ $$($1_$2_EXTRA_LD_OPTS) \ - $$(EXTRA_LD_OPTS) + $$(EXTRA_LD_OPTS) \ + $$(CONF_LD_LINKER_OPTS_STAGE$4) # Options for passing to GHC when we use it for linking $1_$2_$3_GHC_LD_OPTS = \ |