Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
GHC
Commits
13b80f77
Commit
13b80f77
authored
May 19, 2016
by
Andrey Mokhov
Browse files
Unify include and link paths
parent
dd3d5923
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/Settings/Builders/Common.hs
View file @
13b80f77
...
...
@@ -25,7 +25,7 @@ cIncludeArgs = do
mconcat
[
arg
$
"-I"
++
path
,
arg
$
"-I"
++
path
-/-
"autogen"
,
append
[
"-I"
++
pkgPath
pkg
-/-
dir
|
dir
<-
incDirs
]
,
append
[
"-I"
++
dir
|
dir
<-
depDirs
]
]
,
append
[
"-I"
++
unifyPath
dir
|
dir
<-
depDirs
]
]
ldArgs
::
Args
ldArgs
=
mempty
...
...
src/Settings/Builders/Ghc.hs
View file @
13b80f77
...
...
@@ -44,8 +44,8 @@ ghcLinkArgs = builder (Ghc Link) ? do
else
return
[]
libDirs
<-
getPkgDataList
DepLibDirs
mconcat
[
arg
"-no-auto-link-packages"
,
append
[
"-optl-l"
++
lib
|
lib
<-
libs
++
gmpLibs
]
,
append
[
"-optl-L"
++
dir
|
dir
<-
libDirs
]
]
,
append
[
"-optl-l"
++
lib
|
lib
<-
libs
++
gmpLibs
]
,
append
[
"-optl-L"
++
unifyPath
dir
|
dir
<-
libDirs
]
]
-- TODO: Add Touchy builder and use needBuilder.
needTouchy
::
ReaderT
Target
Action
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment