1
1
mirror of https://github.com/github/semantic.git synced 2024-11-23 08:27:56 +03:00

Revert "Build both static & dynamic files so we don’t have to live in a separate build dir."

This reverts commit 47b0dac3d8.
This commit is contained in:
Rob Rix 2019-10-30 16:34:16 -04:00
parent ade87132f6
commit 733a0a4628
No known key found for this signature in database
GPG Key ID: F188A01508EA1CF7
2 changed files with 14 additions and 13 deletions

View File

@ -10,20 +10,15 @@
-- Compile to object code
:set -fwrite-interface -fobject-code
-- Build both static & dynamic objects so we dont confuse cabal build
:set -static
:set -dynamic-too
:set -dynosuf dyn_o
:set -dynhisuf dyn_hi
-- Write build products to dist-newstyle (instead of alongside the .hs files)
:set -outputdir dist-newstyle/build/x86_64-osx/ghc-8.6.5/semantic-0.8.0.0/build
:set -odir dist-newstyle/build/x86_64-osx/ghc-8.6.5/semantic-0.8.0.0/build
:set -hidir dist-newstyle/build/x86_64-osx/ghc-8.6.5/semantic-0.8.0.0/build
:set -stubdir dist-newstyle/build/x86_64-osx/ghc-8.6.5/semantic-0.8.0.0/build
-- Write build products to dist-repl (so that we dont clobber 'cabal build' outputs)
:set -outputdir dist-repl/build/x86_64-osx/ghc-8.6.5/semantic-0.8.0.0/build
:set -odir dist-repl/build/x86_64-osx/ghc-8.6.5/semantic-0.8.0.0/build
:set -hidir dist-repl/build/x86_64-osx/ghc-8.6.5/semantic-0.8.0.0/build
:set -stubdir dist-repl/build/x86_64-osx/ghc-8.6.5/semantic-0.8.0.0/build
-- Look for autogend files in dist-newstyle
:set -idist-newstyle/build/x86_64-osx/ghc-8.6.5/semantic-0.8.0.0/build/autogen
-- Look for autogend files in dist-repl
:set -idist-repl/build/x86_64-osx/ghc-8.6.5/semantic-0.8.0.0/build/autogen
-- Load all our sources… remember to keep this up to date when we add new packages!
-- But dont add semantic-source, its important that we get that from hackage.

View File

@ -6,4 +6,10 @@ set -e
cd $(dirname "$0")/..
cabal exec ghci -- -ghci-script=.ghci.semantic $@
repl_builddir=dist-repl
if [[ ! -d $repl_builddir ]]; then
echo "$repl_builddir does not exist, first run 'cabal repl --builddir=$replbuilddir', exit, and then re-run $0"
else
cabal exec --builddir=$repl_builddir ghci -- -ghci-script=.ghci.semantic $@
fi