Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
GHC
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
4,311
Issues
4,311
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
382
Merge Requests
382
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Glasgow Haskell Compiler
GHC
Commits
ec5e9d3a
Commit
ec5e9d3a
authored
Jun 06, 2018
by
Alp Mestanogullari
Committed by
Andrey Mokhov
Jun 06, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Do not always add -Iincludes to C arguments (
#610
)
parent
c0292ffc
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
src/Settings/Builders/Common.hs
src/Settings/Builders/Common.hs
+2
-1
No files found.
src/Settings/Builders/Common.hs
View file @
ec5e9d3a
...
...
@@ -11,6 +11,7 @@ module Settings.Builders.Common (
import
Base
import
Expression
import
GHC.Packages
import
Hadrian.Haskell.Cabal.PackageData
import
Oracles.Flag
import
Oracles.Setting
...
...
@@ -27,7 +28,7 @@ cIncludeArgs = do
iconvIncludeDir
<-
getSetting
IconvIncludeDir
gmpIncludeDir
<-
getSetting
GmpIncludeDir
ffiIncludeDir
<-
getSetting
FfiIncludeDir
mconcat
[
arg
"-Iincludes"
mconcat
[
notStage0
||^
package
compiler
?
arg
"-Iincludes"
,
arg
$
"-I"
++
root
-/-
generatedDir
,
arg
$
"-I"
++
path
,
pure
.
map
(
"-I"
++
)
.
filter
(
/=
""
)
$
[
iconvIncludeDir
,
gmpIncludeDir
]
...
...
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