diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2020-07-11 13:46:26 +0000 |
|---|---|---|
| committer | Moritz Angermann <moritz.angermann@gmail.com> | 2020-07-11 13:46:26 +0000 |
| commit | 5b25d69e36153773bd7c3c125af6c53433e29f0d (patch) | |
| tree | 31531103d94157476f97fb5968519abbb6f4c4e3 | |
| parent | 0292fea2c8aaeb195d27477adcde0725f783adf7 (diff) | |
| download | haskell-wip/angerman/aarch64-dev-shell.tar.gz | |
Dev shells updatewip/angerman/aarch64-dev-shell
| -rw-r--r-- | nix-dev-shells/aarch64-ncg.nix | 15 | ||||
| -rw-r--r-- | nix-dev-shells/quick-cross-ncg.mk | 2 | ||||
| -rw-r--r-- | nix-dev-shells/quick-cross.mk | 2 |
3 files changed, 16 insertions, 3 deletions
diff --git a/nix-dev-shells/aarch64-ncg.nix b/nix-dev-shells/aarch64-ncg.nix index 7d73fe0c9c..df54a84451 100644 --- a/nix-dev-shells/aarch64-ncg.nix +++ b/nix-dev-shells/aarch64-ncg.nix @@ -60,6 +60,14 @@ pkgs.mkShell { echo "WARN: not in ghc-test, not running!" fi } + function generic-build () { + case "$(basename $PWD)" in + ghc) build-ghc && make install ;; + ghc-ncg) PATH=\$HOME/opt/bin:\$PATH build-ncg ;; + ghc-llvm) PATH=\$HOME/opt/bin:\$PATH build-llvm ;; + *) echo "unknown path $PWD" ;; + esac + } echo "=== active worktrees ===" git worktree list echo "=== the following fuctions are available ===" @@ -67,10 +75,15 @@ pkgs.mkShell { echo " use this to build the stage2 ghc to use for the llvm and ncg builds" echo "build-llvm -- build the llvm ghc" echo " e.g. time PATH=\$HOME/opt/bin:\$PATH build-llvm" - echo "build-ghc -- build the ncg ghc" + echo "build-ncg -- build the ncg ghc" echo " e.g. time PATH=\$HOME/opt/bin:\$PATH build-ncg" echo "run-test <arg> -- run the test-suite." echo " run-test ghc-llvm, or run-test ghc-ncg" + + alias tn="time run-test ghc-ncg" + alias tl="time run-test ghc-llvm" + alias b="time generic-build" + ''; hardeningDisable = [ "format" "fortify" ]; buildInputs = with pkgs; [ diff --git a/nix-dev-shells/quick-cross-ncg.mk b/nix-dev-shells/quick-cross-ncg.mk index eea074d4bd..05cae2361a 100644 --- a/nix-dev-shells/quick-cross-ncg.mk +++ b/nix-dev-shells/quick-cross-ncg.mk @@ -7,4 +7,4 @@ HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO GhcLibHcOpts += -fPIC -keep-s-file -GhcRtsHcOpts += -fPIC -keep-s-file
\ No newline at end of file +GhcRtsHcOpts += -fPIC
\ No newline at end of file diff --git a/nix-dev-shells/quick-cross.mk b/nix-dev-shells/quick-cross.mk index a458fa4f9c..695b228fb2 100644 --- a/nix-dev-shells/quick-cross.mk +++ b/nix-dev-shells/quick-cross.mk @@ -7,4 +7,4 @@ HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO GhcLibHcOpts += -fPIC -keep-s-file -GhcRtsHcOpts += -fPIC -keep-s-file
\ No newline at end of file +GhcRtsHcOpts += -fPIC
\ No newline at end of file |