summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorSimon Marlow <marlowsd@gmail.com>2016-10-27 12:52:00 +0100
committerSimon Marlow <marlowsd@gmail.com>2016-11-03 14:55:07 -0700
commita977c96537bb7077c6445f02db98636b150e6e14 (patch)
treec918e4f1dfdf39a4f51ca7cc68355385b186a1fc /rules
parentf46bfeb8344e1818f42066c3dd9717f49e8b511b (diff)
downloadhaskell-a977c96537bb7077c6445f02db98636b150e6e14.tar.gz
Omit unnecessary linker flags
Summary: This omits -L and -l flags from the linker command line that shouldn't be necessary because GHC will already add them via the -package-id flags we pass. This also reverts part of 90538d86af579595987826cd893828d6f379f35a that rearranges the linker command line and causes some knock-on problems (see D2618). Test Plan: validate (need to validate on Windows too) Reviewers: Phyx, bgamari, niteria, austin, erikd Subscribers: thomie Differential Revision: https://phabricator.haskell.org/D2639 GHC Trac Issues: #12738
Diffstat (limited to 'rules')
-rw-r--r--rules/distdir-opts.mk5
1 files changed, 0 insertions, 5 deletions
diff --git a/rules/distdir-opts.mk b/rules/distdir-opts.mk
index 0d60f99fe6..b3dfba1c44 100644
--- a/rules/distdir-opts.mk
+++ b/rules/distdir-opts.mk
@@ -44,16 +44,11 @@ $1_$2_DIST_CC_OPTS = \
$$($1_$2_DEP_CC_OPTS) \
$$(SRC_CC_WARNING_OPTS)
-ifneq ($$(strip $$($1_$2_DEP_LIB_DIRS_SINGLE_QUOTED)),)
-$1_$2_DIST_LD_LIB_DIRS := $$(subst $$(space)',$$(space)-L',$$(space)$$($1_$2_DEP_LIB_DIRS_SINGLE_QUOTED))
-endif
-
$1_$2_DIST_LD_OPTS = \
$$(SRC_LD_OPTS) \
$$($1_LD_OPTS) \
$$($1_$2_LD_OPTS) \
$$($1_$2_DIST_LD_LIB_DIRS) \
- $$(foreach opt,$$($1_$2_DEP_EXTRA_LIBS),-l$$(opt)) \
$$($1_$2_DEP_LD_OPTS)
# c.f. Cabal's Distribution.Simple.PreProcess.ppHsc2hs