github/semantic
1
1
Fork 0
mirror of https://github.com/github/semantic.git synced 2024-11-24 00:42:33 +03:00
Code Issues Projects Releases Wiki Activity

Disallow customizing the build dir.

Browse Source
This commit is contained in:
Rob Rix 2019-12-18 09:00:23 -05:00
parent be39dae6a0
commit cbb45e4154
No known key found for this signature in database
GPG Key ID: F188A01508EA1CF7
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
script/ghci-flags
View File

@ -11,27 +11,20 @@ ghc_version="$(ghc --numeric-version)"
# recent hie-bios requires us to output to the file at $HIE_BIOS_OUTPUT, but older builds & script/repl don’t set that var, so we default it to stdout # recent hie-bios requires us to output to the file at $HIE_BIOS_OUTPUT, but older builds & script/repl don’t set that var, so we default it to stdout
output_file="${HIE_BIOS_OUTPUT:-/dev/stdout}" output_file="${HIE_BIOS_OUTPUT:-/dev/stdout}"
if [ "$1" == "--builddir" ]; then cabal v2-build -v0 all --only-dependencies
repl_builddir="$2"
shift 2
else
repl_builddir=dist-newstyle
fi
cabal v2-build -v0 --builddir="$repl_builddir" all --only-dependencies
function flags { function flags {
echo "-O0" echo "-O0"
echo "-ignore-dot-ghci" echo "-ignore-dot-ghci"
echo "-outputdir $repl_builddir/build/x86_64-osx/ghc-$ghc_version/build-repl" echo "-outputdir dist-newstyle/build/x86_64-osx/ghc-$ghc_version/build-repl"
echo "-odir $repl_builddir/build/x86_64-osx/ghc-$ghc_version/build-repl" echo "-odir dist-newstyle/build/x86_64-osx/ghc-$ghc_version/build-repl"
echo "-hidir $repl_builddir/build/x86_64-osx/ghc-$ghc_version/build-repl" echo "-hidir dist-newstyle/build/x86_64-osx/ghc-$ghc_version/build-repl"
echo "-stubdir $repl_builddir/build/x86_64-osx/ghc-$ghc_version/build-repl" echo "-stubdir dist-newstyle/build/x86_64-osx/ghc-$ghc_version/build-repl"
echo "-i$root/$repl_builddir/build/x86_64-osx/ghc-$ghc_version/build-repl/autogen" echo "-i$root/dist-newstyle/build/x86_64-osx/ghc-$ghc_version/build-repl/autogen"
echo "-I$root/$repl_builddir/build/x86_64-osx/ghc-$ghc_version/build-repl/autogen" echo "-I$root/dist-newstyle/build/x86_64-osx/ghc-$ghc_version/build-repl/autogen"
echo "-i$root/semantic-analysis/src" echo "-i$root/semantic-analysis/src"
echo "-i$root/semantic-ast/src" echo "-i$root/semantic-ast/src"
@ -46,12 +39,12 @@ function flags {
echo "-i$root/test" echo "-i$root/test"
echo "-optP-include" echo "-optP-include"
echo "-optP$root/$repl_builddir/build/x86_64-osx/ghc-$ghc_version/build-repl/autogen/cabal_macros.h" echo "-optP$root/dist-newstyle/build/x86_64-osx/ghc-$ghc_version/build-repl/autogen/cabal_macros.h"
echo "-hide-all-packages" echo "-hide-all-packages"
# Emit package flags from the environment file, removing comments & prefixing with - # Emit package flags from the environment file, removing comments & prefixing with -
cabal v2-exec --builddir="$repl_builddir" -v0 bash -- -c 'cat "$GHC_ENVIRONMENT"' | grep -v '^--' | sed -e 's/^/-/' cabal v2-exec -v0 bash -- -c 'cat "$GHC_ENVIRONMENT"' | grep -v '^--' | sed -e 's/^/-/'
echo "-XHaskell2010" echo "-XHaskell2010"
echo "-XStrictData" echo "-XStrictData"

4
script/repl
View File

@ -6,6 +6,4 @@ set -e
cd "$(dirname "$0")/.." cd "$(dirname "$0")/.."
repl_builddir=dist-newstyle cabal v2-exec env -- -u GHC_ENVIRONMENT ghci -ghci-script=.ghci.repl $(script/ghci-flags) -no-ignore-dot-ghci $@
cabal v2-exec --builddir="$repl_builddir" env -- -u GHC_ENVIRONMENT ghci -ghci-script=.ghci.repl $(script/ghci-flags --builddir "$repl_builddir") -no-ignore-dot-ghci $@