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
666f5c24
Commit
666f5c24
authored
Apr 30, 2016
by
Andrey Mokhov
Browse files
Move Hadrian executable to /hadrian.
parent
a37ad750
Changes
6
Hide whitespace changes
Inline
Side-by-side
.gitignore
View file @
666f5c24
/.shake/
/.db/
cfg/system.config
# build.bat and build.sh specific
/hadrian
/hadrian.exe
# build.cabal.sh specific
/dist/
/.cabal-sandbox/
...
...
.travis.yml
View file @
666f5c24
...
...
@@ -48,8 +48,6 @@ install:
# ".git" directory into the appropriate location, and perform a hard reset
# in order to regenerate the GHC-Shake files.
-
mkdir ghc/hadrian
-
mkdir ghc/_build
-
mkdir ghc/_build/hadrian
-
mv .git ghc/hadrian
-
( cd ghc/hadrian && git reset --hard HEAD )
...
...
appveyor.yml
View file @
666f5c24
...
...
@@ -36,9 +36,6 @@ install:
-
alex --version
-
happy --version
-
stack exec -- ghc-pkg list
-
mkdir _build
-
cd _build
-
mkdir hadrian
build_script
:
-
cd C:\msys64\home\ghc\hadrian
...
...
build.bat
View file @
666f5c24
@cd
%~dp0
@mkdir ../_build
2
>
nul
@mkdir ../_build
/hadrian
2
>
nul
@set
ghcArgs
=
--make
^
-Wall
^
...
...
@@ -13,7 +13,7 @@
-outputdir
=
../_build/hadrian
^
-j
^
-O
^
-o
../_build/
hadrian
-o
hadrian
@set
hadrianArgs
=
--lint
^
--directory
^
...
...
@@ -27,4 +27,4 @@
@rem Unset GHC_PACKAGE_PATH variable, as otherwise ghc-cabal complains
@set
GHC_PACKAGE_PATH
=
@
..\_build\
hadrian
%hadrianArgs%
@hadrian
%hadrianArgs%
build.sh
View file @
666f5c24
...
...
@@ -30,7 +30,7 @@ function rl {
root
=
"
$(
dirname
"
$(
rl
"
$0
"
)
"
)
"
mkdir
-p
"
$root
/../_build"
mkdir
-p
"
$root
/../_build
/hadrian
"
ghc
\
"
$root
/src/Main.hs"
\
...
...
@@ -43,9 +43,9 @@ ghc \
-threaded
\
-outputdir
=
"
$root
/../_build/hadrian"
\
-j
-O
\
-o
"
$root
/
../_build/
hadrian"
-o
"
$root
/hadrian"
"
$root
/
../_build/hadrian"
\
"
$root
/
hadrian"
\
--lint
\
--directory
"
$root
/.."
\
--colour
\
...
...
src/Rules/Clean.hs
View file @
666f5c24
...
...
@@ -17,8 +17,7 @@ clean dir = do
cleanRules
::
Rules
()
cleanRules
=
do
"clean"
~>
do
forM_
[
Stage0
..
]
$
\
stage
->
clean
(
buildRootPath
-/-
stageString
stage
)
clean
(
buildRootPath
-/-
"hadrian"
)
clean
buildRootPath
clean
programInplacePath
clean
"inplace/lib"
clean
derivedConstantsPath
...
...
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