Commit efbc205b authored by Valentin Reis's avatar Valentin Reis
Browse files

[fix] Makefile fixes.

parent 95f48960
Pipeline #10713 failed with stages
in 2 minutes and 37 seconds
......@@ -52,7 +52,7 @@ dhrun/%:
let all = ./dev/dhrun/all-tests.dh
"../dev/dhrun/assets/"
"../hsnrm/resources/defaults/Cfg.dhall // { verbose=<Normal|Verbose|Debug>.Debug }"
"../hsnrm/resources/examples/"
"../hsnrm/resources/examples-manifests/"
in all.$*
'
......@@ -160,7 +160,7 @@ ci:
done
'
ci-%:
ci/%:
@nix-shell --run bash <<< '
gitlab-runner exec shell "$*"
'
......
......@@ -11,7 +11,7 @@ SHELL := $(shell which bash)
# https://github.com/NixOS/nix/issues/726#issuecomment-161215255
NIX_PATH := nixpkgs=./.
all: hsnrm-extra/hsnrm-extra.cabal hsnrm-static/hsnrm-static.cabal hsnrm-bin/hsnrm-bin.cabal hsnrm/hsnrm.cabal dist-newstyle/build/x86_64-linux/ghc-8.6.5/hsnrm-1.0.0/x/nrm.so/build/nrm.so/nrm.so resources
all: hsnrm-extra/hsnrm-extra.cabal hsnrm-static/hsnrm-static.cabal hsnrm-bin/hsnrm-bin.cabal hsnrm/hsnrm.cabal build resources
dhall-to-cabal: ../default.nix
rm -rf ./dhall-to-cabal
......@@ -34,9 +34,10 @@ dhall-to-cabal: ../default.nix
dhall-to-cabal --output-stdout <<< "./$*.dhall \"$$GHCDIR\" \"$$GHCVERSION\"" > $@
'
dist-newstyle/build/x86_64-linux/ghc-8.6.5/hsnrm-1.0.0/x/nrm.so/build/nrm.so/nrm.so: hsnrm/ hsnrm-bin/
.PHONY: build
build: hsnrm/ hsnrm-bin/
@nix-shell --pure --run bash <<< '
cabal v2-build hsnrm-bin
cabal v2-build hsnrm-bin hsnrm-extra
'
resources: hsnrm/* hsnrm-bin/*
......
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