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
GHC
Commits
86b63df1
Commit
86b63df1
authored
Jan 07, 2015
by
Andrey Mokhov
Browse files
Remove argConfWith which became redundant.
parent
9a24f387
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/Package/Base.hs
View file @
86b63df1
...
...
@@ -65,7 +65,7 @@ commonCcWarninigArgs :: Args
commonCcWarninigArgs
=
when
Validating
$
when
GccIsClang
(
arg
"-Wno-unknown-pragmas"
)
<>
when
(
not
GccIsClang
&&
not
GccLt46
)
(
arg
"-Wno-error=inline"
)
<>
when
(
GccIsClang
&&
not
GccLt46
&&
windowsHost
)
(
arg
"-Werror=unused-but-set-variable"
)
<>
when
(
GccIsClang
&&
not
GccLt46
&&
windowsHost
)
(
arg
"-Werror=unused-but-set-variable"
)
bootPkgConstraints
::
Args
bootPkgConstraints
=
mempty
...
...
src/Package/Data.hs
View file @
86b63df1
...
...
@@ -18,11 +18,7 @@ libraryArgs ways =
configureArgs
::
Stage
->
Settings
->
Args
configureArgs
stage
settings
=
let
argConf
::
String
->
Args
->
Args
argConf
key
as
=
joinArgs
"--configure-option="
key
"="
as
argConfWith
key
opt
=
do
opts
<-
showAction
opt
when
(
opts
/=
[]
)
$
argConf
(
"--with-"
++
key
)
$
arg
opts
argConf
key
as
=
unless
(
null
<$>
as
)
$
joinArgs
"--configure-option="
key
"="
as
cflags
=
joinArgsSpaced
(
commonCcArgs
`
filterOut
`
[
"-Werror"
])
(
ConfCcArgs
stage
)
...
...
@@ -36,10 +32,10 @@ configureArgs stage settings =
,
argConf
"LDFLAGS"
ldflags
,
argConf
"CPPFLAGS"
cppflags
,
joinArgs
"--gcc-options="
cflags
" "
ldflags
,
argConf
W
ith
"
iconv-includes"
IconvIncludeDirs
,
argConf
W
ith
"
iconv-libraries"
IconvLibDirs
,
argConf
W
ith
"
gmp-includes"
GmpIncludeDirs
,
argConf
W
ith
"
gmp-libraries"
GmpLibDirs
,
argConf
"--w
ith
-
iconv-includes"
$
arg
IconvIncludeDirs
,
argConf
"--w
ith
-
iconv-libraries"
$
arg
IconvLibDirs
,
argConf
"--w
ith
-
gmp-includes"
$
arg
GmpIncludeDirs
,
argConf
"--w
ith
-
gmp-libraries"
$
arg
GmpLibDirs
,
when
CrossCompiling
$
argConf
"--host"
$
arg
TargetPlatformFull
-- TODO: why not host?
,
argConf
"--with-cc"
$
arg
Gcc
]
...
...
@@ -66,13 +62,13 @@ buildPackageData pkg @ (Package name path _) (stage, dist, settings) =
[
args
"configure"
path
dist
-- this is a positional argument, hence:
-- * if it is empty, we need to emit one empty string argument
-- * if there are many, we must collapse them into one s
tring argument
,
joinArgsSpaced
$
customDllArgs
settings
-- * if there are many, we must collapse them into one s
pace-separated string
,
joinArgsSpaced
""
(
customDllArgs
settings
)
,
with
$
Ghc
stage
-- TODO: used to be stage01 (using max Stage1 GHC)
,
with
$
GhcPkg
stage
,
with
$
GhcPkg
stage
,
customConfArgs
settings
,
libraryArgs
=<<
ways
settings
,
libraryArgs
=<<
ways
settings
,
when
hsColourSrcs
$
with
HsColour
,
configureArgs
stage
settings
...
...
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