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,335
Issues
4,335
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
370
Merge Requests
370
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
91108137
Unverified
Commit
91108137
authored
Apr 18, 2018
by
Andrey Mokhov
Committed by
GitHub
Apr 18, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix AppVeyor (
#577
)
* Copy inplace/mingw to the build root * Run Hadrian with -c on AppVeyor
parent
1174b315
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
7 deletions
+9
-7
appveyor.yml
appveyor.yml
+2
-6
src/Rules/Configure.hs
src/Rules/Configure.hs
+7
-1
No files found.
appveyor.yml
View file @
91108137
...
...
@@ -30,13 +30,9 @@ install:
-
appveyor-retry stack exec -- pacman -S autoconf automake-wrapper make patch python3 tar --noconfirm
build_script
:
# Boot and configure ghc source tree
-
cd ..
-
hadrian\stack exec -- python3 boot
-
hadrian\stack exec -- bash configure --enable-distro-toolchain
# Build GHC
-
hadrian\build -j --flavour=quickest --integer-simple --no-progress --progress-colour=never --profile=-
-
cd ..
-
hadrian\build -c -j --flavour=quickest --integer-simple --no-progress --progress-colour=never --profile=-
# Test GHC binary
-
_build\stage1\bin\ghc -e 1+2
src/Rules/Configure.hs
View file @
91108137
...
...
@@ -12,7 +12,7 @@ import Utilities
configureRules
::
Rules
()
configureRules
=
do
-- TODO: consider other files we should track here
(rts/rts.cabal etc)
-- TODO: consider other files we should track here
, e.g. @rts/rts.cabal@.
[
configFile
,
"settings"
,
configH
,
"compiler/ghc.cabal"
]
&%>
\
outs
->
do
skip
<-
not
<$>
cmdConfigure
if
skip
...
...
@@ -29,6 +29,12 @@ configureRules = do
context
=
vanillaContext
Stage0
compiler
need
srcs
build
$
target
context
(
Configure
"."
)
srcs
outs
-- We need to copy the directory with unpacked Windows tarball to
-- the build directory, so that the built GHC has access to it.
-- See https://github.com/snowleopard/hadrian/issues/564.
when
System
.
isWindows
$
do
root
<-
buildRoot
copyDirectory
"inplace/mingw"
(
root
-/-
"mingw"
)
[
"configure"
,
configH
<.>
"in"
]
&%>
\
_
->
do
skip
<-
not
<$>
cmdConfigure
...
...
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