Commit 666f5c24 authored by Andrey Mokhov's avatar Andrey Mokhov
Browse files

Move Hadrian executable to /hadrian.

parent a37ad750
/.shake/
/.db/
cfg/system.config
# build.bat and build.sh specific
/hadrian
/hadrian.exe
# build.cabal.sh specific
/dist/
/.cabal-sandbox/
......
......@@ -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 )
......
......@@ -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
......
@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%
......@@ -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 \
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment