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
ecdeae76
Commit
ecdeae76
authored
Dec 23, 2015
by
Andrey Mokhov
Browse files
Clean up.
parent
ba41dedc
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/Oracles/WindowsRoot.hs
View file @
ecdeae76
...
...
@@ -14,7 +14,7 @@ windowsRoot = askOracle $ WindowsRoot ()
-- the root is slow (at least the current implementation).
windowsRootOracle
::
Rules
()
windowsRootOracle
=
do
root
<-
newCache
$
\
()
->
do
root
<-
newCache
$
\
_
->
do
Stdout
out
<-
quietly
$
cmd
[
"cygpath"
,
"-m"
,
"/"
]
let
root
=
dropWhileEnd
isSpace
out
putOracle
$
"Detected root on Windows: "
++
root
...
...
src/Rules/Data.hs
View file @
ecdeae76
...
...
@@ -44,19 +44,19 @@ buildPackageData rs target @ (PartialTarget stage pkg) = do
-- TODO: code duplication around ghcIncludeDirs
priority
2.0
$
do
when
(
pkg
==
hp2ps
)
$
dataFile
%>
\
mk
->
do
let
cSrcs
=
[
"AreaBelow.c"
,
"Curves.c"
,
"Error.c"
,
"Main.c
"
,
"Reorder.c"
,
"TopTwenty.c"
,
"AuxFile.c"
,
"Deviatio
n.c"
,
"HpFile.c"
,
"Marks.c"
,
"Scale.c"
,
"TraceElement
.c"
,
"
Axes.c"
,
"Dimensions
.c"
,
"
Key
.c"
,
"
PsFi
le.c"
,
"
Shade.c"
,
"Utilities.c"
]
contents
=
unlines
[
"utils_hp2ps_stage0_PROGNAME = hp2ps"
,
"
utils_hp2ps_stage0_C_SRCS = "
++
unwords
cSrcs
,
"
utils_hp2ps_stage0_INSTALL = YES"
,
"
utils_hp2ps_stage0_INSTALL_INPLACE
= YES"
,
"
utils_hp2ps_stage0_DEP_EXTRA_LIBS = m
"
,
"
utils_hp2ps_stage0_CC_OPT
S = "
++
unwords
(
map
(
"-I"
++
)
ghcIncludeDirs
)
]
let
prefix
=
"utils_hp2ps_stage"
++
show
(
fromEnum
stage
)
++
"_
"
cSrcs
=
[
"AreaBelow.c"
,
"Curves.c"
,
"Error.c"
,
"Mai
n.c"
,
"Reorder.c"
,
"TopTwenty.c"
,
"AuxFile
.c"
,
"
Deviation.c"
,
"HpFile
.c"
,
"
Marks
.c"
,
"
Sca
le.c"
,
"
TraceElement.c"
,
"Axes.c"
,
"Dimensions.c"
,
"Key.c"
,
"PsFile.c"
,
"Shade.c"
,
"Utilities.c"
]
contents
=
unlines
$
map
(
prefix
++
)
[
"
PROGNAME = hp2ps"
,
"
C_SRCS = "
++
unwords
cSrcs
,
"
INSTALL
= YES"
,
"
INSTALL_INPLACE = YES
"
,
"
DEP_EXTRA_LIB
S =
m
"
,
"CC_OPTS = "
++
unwords
(
map
(
"-I"
++
)
ghcIncludeDirs
)
]
writeFileChanged
mk
contents
putBuild
$
"| Successfully generated '"
++
mk
++
"'."
...
...
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