Commit 7bd5dd09 authored by Ben Gamari's avatar Ben Gamari Committed by Ben Gamari
Browse files

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

(cherry picked from commit e2a9b529a8b06e2dace8c2b4c58710cf5e57ef03)
parent 3a0532a8
......@@ -665,15 +665,20 @@ FPTOOLS_SET_C_LD_FLAGS([target],[CONF_CC_OPTS_STAGE2],[CONF_GCC_LINKER_OPTS_STAG
FP_GCC_EXTRA_FLAGS
# See rules/distdir-way-opts.mk for details.
# Flags passed to the C compiler
AC_SUBST(CONF_CC_OPTS_STAGE0)
AC_SUBST(CONF_CC_OPTS_STAGE1)
AC_SUBST(CONF_CC_OPTS_STAGE2)
# Flags passed to the C compiler when we ask it to link
AC_SUBST(CONF_GCC_LINKER_OPTS_STAGE0)
AC_SUBST(CONF_GCC_LINKER_OPTS_STAGE1)
AC_SUBST(CONF_GCC_LINKER_OPTS_STAGE2)
# Flags passed to the linker when we ask it to link
AC_SUBST(CONF_LD_LINKER_OPTS_STAGE0)
AC_SUBST(CONF_LD_LINKER_OPTS_STAGE1)
AC_SUBST(CONF_LD_LINKER_OPTS_STAGE2)
# Flags passed to the C preprocessor
AC_SUBST(CONF_CPP_OPTS_STAGE0)
AC_SUBST(CONF_CPP_OPTS_STAGE1)
AC_SUBST(CONF_CPP_OPTS_STAGE2)
......
......@@ -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)
......@@ -186,7 +195,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 = \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment