Commit 179f5b14 authored by Andrey Mokhov's avatar Andrey Mokhov

Build Hadrian in /hadrian/bin

parent aa6bba12
......@@ -2,8 +2,7 @@
cfg/system.config
# build.bat and build.sh specific
/hadrian
/hadrian.exe
/bin/
# build.cabal.sh specific
/dist/
......
@cd %~dp0
@mkdir ../_build/hadrian 2> nul
@set ghcArgs=--make ^
-Wall ^
-fno-warn-name-shadowing ^
-XRecordWildCards ^
src/Main.hs ^
-threaded ^
-isrc ^
-rtsopts ^
-with-rtsopts=-I0 ^
-outputdir=../_build/hadrian ^
-i../libraries/Cabal/Cabal ^
-j ^
-O ^
-o hadrian
@set hadrianArgs=--lint ^
--directory ^
".." ^
%*
@ghc %ghcArgs%
@if %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
@rem Unset GHC_PACKAGE_PATH variable, as otherwise ghc-cabal complains
@set GHC_PACKAGE_PATH=
@hadrian %hadrianArgs%
@cd %~dp0
@mkdir bin 2> nul
@set ghcArgs=--make ^
-Wall ^
-fno-warn-name-shadowing ^
-XRecordWildCards ^
src\Main.hs ^
-threaded ^
-isrc ^
-i..\libraries\Cabal\Cabal ^
-rtsopts ^
-with-rtsopts=-I0 ^
-outputdir=bin ^
-j ^
-O ^
-o bin\hadrian
@set hadrianArgs=--lint ^
--directory ^
".." ^
%*
@ghc %ghcArgs%
@if %ERRORLEVEL% NEQ 0 EXIT /B %ERRORLEVEL%
@rem Unset GHC_PACKAGE_PATH variable, as otherwise ghc-cabal complains
@set GHC_PACKAGE_PATH=
@bin\hadrian %hadrianArgs%
......@@ -39,7 +39,7 @@ if type cabal > /dev/null 2>&1; then
fi
fi
mkdir -p "$root/../_build/hadrian"
mkdir -p "$root/bin"
ghc \
"$root/src/Main.hs" \
......@@ -51,11 +51,11 @@ ghc \
-rtsopts \
-with-rtsopts=-I0 \
-threaded \
-outputdir="$root/../_build/hadrian" \
-outputdir="$root/bin" \
-j -O \
-o "$root/hadrian"
-o "$root/bin/hadrian"
"$root/hadrian" \
"$root/bin/hadrian" \
--lint \
--directory "$root/.." \
"$@"
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