Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
16920c6b
Commit
16920c6b
authored
Oct 29, 2013
by
Mikhail Glushenkov
Browse files
When invoking hsc2hs, mention 'cabal_macros.h' only once.
Before & after:
https://gist.github.com/23Skidoo/7220763
parent
30eceb8f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Cabal/Distribution/Simple/PreProcess.hs
View file @
16920c6b
...
...
@@ -453,6 +453,9 @@ ppHsc2hs bi lbi =
++
[
"--cflag=-I"
++
dir
|
dir
<-
PD
.
includeDirs
bi
]
++
[
"--cflag="
++
opt
|
opt
<-
PD
.
ccOptions
bi
++
PD
.
cppOptions
bi
]
++
[
"--cflag="
++
opt
|
opt
<-
[
"-I"
++
autogenModulesDir
lbi
,
"-include"
,
autogenModulesDir
lbi
</>
cppHeaderName
]
]
++
[
"--lflag=-L"
++
opt
|
opt
<-
PD
.
extraLibDirs
bi
]
++
[
"--lflag=-Wl,-R,"
++
opt
|
isELF
,
opt
<-
PD
.
extraLibDirs
bi
]
...
...
@@ -463,9 +466,7 @@ ppHsc2hs bi lbi =
++
[
"--cflag="
++
opt
|
pkg
<-
pkgs
,
opt
<-
[
"-I"
++
opt
|
opt
<-
Installed
.
includeDirs
pkg
]
++
[
opt
|
opt
<-
Installed
.
ccOptions
pkg
]
++
[
"-I"
++
autogenModulesDir
lbi
,
"-include"
,
autogenModulesDir
lbi
</>
cppHeaderName
]
]
++
[
opt
|
opt
<-
Installed
.
ccOptions
pkg
]
]
++
[
"--lflag="
++
opt
|
pkg
<-
pkgs
,
opt
<-
[
"-L"
++
opt
|
opt
<-
Installed
.
libraryDirs
pkg
]
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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