diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2016-10-27 12:52:00 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2016-11-03 14:55:07 -0700 |
| commit | a977c96537bb7077c6445f02db98636b150e6e14 (patch) | |
| tree | c918e4f1dfdf39a4f51ca7cc68355385b186a1fc /utils/ghc-cabal | |
| parent | f46bfeb8344e1818f42066c3dd9717f49e8b511b (diff) | |
| download | haskell-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 'utils/ghc-cabal')
| -rw-r--r-- | utils/ghc-cabal/Main.hs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs index 4b6b496b66..3b55fe7b0a 100644 --- a/utils/ghc-cabal/Main.hs +++ b/utils/ghc-cabal/Main.hs @@ -399,7 +399,6 @@ generate directory distdir dll0Modules config_args mkLibraryRelDir l = "libraries/" ++ l ++ "/dist-install/build" libraryRelDirs = map mkLibraryRelDir transitiveDepNames wrappedIncludeDirs <- wrap $ forDeps Installed.includeDirs - wrappedLibraryDirs <- wrap libraryDirs let variablePrefix = directory ++ '_':distdir mods = map display modules @@ -439,11 +438,9 @@ generate directory distdir dll0Modules config_args variablePrefix ++ "_LD_OPTS = " ++ unwords (ldOptions bi), variablePrefix ++ "_DEP_INCLUDE_DIRS_SINGLE_QUOTED = " ++ unwords wrappedIncludeDirs, variablePrefix ++ "_DEP_CC_OPTS = " ++ unwords (forDeps Installed.ccOptions), - variablePrefix ++ "_DEP_LIB_DIRS_SINGLE_QUOTED = " ++ unwords wrappedLibraryDirs, variablePrefix ++ "_DEP_LIB_DIRS_SEARCHPATH = " ++ mkSearchPath libraryDirs, variablePrefix ++ "_DEP_LIB_REL_DIRS = " ++ unwords libraryRelDirs, variablePrefix ++ "_DEP_LIB_REL_DIRS_SEARCHPATH = " ++ mkSearchPath libraryRelDirs, - variablePrefix ++ "_DEP_EXTRA_LIBS = " ++ unwords (forDeps Installed.extraLibraries), variablePrefix ++ "_DEP_LD_OPTS = " ++ unwords (forDeps Installed.ldOptions), variablePrefix ++ "_BUILD_GHCI_LIB = " ++ boolToYesNo (withGHCiLib lbi), "", |