pass builddir option in cabal list-bin in all Makefiles

lyokha · Apr 11, 2024 · 6fd0618 · 6fd0618
1 parent 1761eb3
commit 6fd0618
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/test/Aggregate/Makefile b/test/Aggregate/Makefile
@@ -34,7 +34,8 @@ ifeq ($(INPLACE),1)
 endif
 	sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
 	if ! command -v $(NHMTOOL) >/dev/null; then \
-	  PATH=$$(dirname $$(cabal list-bin $(PKGDISTR))):$$PATH; \
+	  PATH=$$(dirname \
+	    $$(cabal list-bin $(PKGDISTR) --builddir="$(BUILDDIR)")):$$PATH; \
 	fi; \
 	$(NHMTOOL) deps $(PKGNAME) -d "$(BUILDDIR)" >> $(GHCENV); \
 	runhaskell --ghc-arg=-package=base \

diff --git a/test/EDE/Makefile b/test/EDE/Makefile
@@ -34,7 +34,8 @@ ifeq ($(INPLACE),1)
 endif
 	sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
 	if ! command -v $(NHMTOOL) >/dev/null; then \
-	  PATH=$$(dirname $$(cabal list-bin $(PKGDISTR))):$$PATH; \
+	  PATH=$$(dirname \
+	    $$(cabal list-bin $(PKGDISTR) --builddir="$(BUILDDIR)")):$$PATH; \
 	fi; \
 	$(NHMTOOL) deps $(PKGNAME) -d "$(BUILDDIR)" >> $(GHCENV); \
 	runhaskell --ghc-arg=-package=base \

diff --git a/test/PCRE/Makefile b/test/PCRE/Makefile
@@ -34,7 +34,8 @@ ifeq ($(INPLACE),1)
 endif
 	sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
 	if ! command -v $(NHMTOOL) >/dev/null; then \
-	  PATH=$$(dirname $$(cabal list-bin $(PKGDISTR))):$$PATH; \
+	  PATH=$$(dirname \
+	    $$(cabal list-bin $(PKGDISTR) --builddir="$(BUILDDIR)")):$$PATH; \
 	fi; \
 	$(NHMTOOL) deps $(PKGNAME) -d "$(BUILDDIR)" >> $(GHCENV); \
 	runhaskell --ghc-arg=-package=base \

diff --git a/test/Prometheus/Makefile b/test/Prometheus/Makefile
@@ -34,7 +34,8 @@ ifeq ($(INPLACE),1)
 endif
 	sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
 	if ! command -v $(NHMTOOL) >/dev/null; then \
-	  PATH=$$(dirname $$(cabal list-bin $(PKGDISTR))):$$PATH; \
+	  PATH=$$(dirname \
+	    $$(cabal list-bin $(PKGDISTR) --builddir="$(BUILDDIR)")):$$PATH; \
 	fi; \
 	$(NHMTOOL) deps $(PKGNAME) -d "$(BUILDDIR)" >> $(GHCENV); \
 	runhaskell --ghc-arg=-package=base \

diff --git a/test/Resolve/Makefile b/test/Resolve/Makefile
@@ -34,7 +34,8 @@ ifeq ($(INPLACE),1)
 endif
 	sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
 	if ! command -v $(NHMTOOL) >/dev/null; then \
-	  PATH=$$(dirname $$(cabal list-bin $(PKGDISTR))):$$PATH; \
+	  PATH=$$(dirname \
+	    $$(cabal list-bin $(PKGDISTR) --builddir="$(BUILDDIR)")):$$PATH; \
 	fi; \
 	$(NHMTOOL) deps $(PKGNAME) -d "$(BUILDDIR)" >> $(GHCENV); \
 	runhaskell --ghc-arg=-package=base \

diff --git a/test/ServiceHookAdaptor/Makefile b/test/ServiceHookAdaptor/Makefile
@@ -34,7 +34,8 @@ ifeq ($(INPLACE),1)
 endif
 	sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
 	if ! command -v $(NHMTOOL) >/dev/null; then \
-	  PATH=$$(dirname $$(cabal list-bin $(PKGDISTR))):$$PATH; \
+	  PATH=$$(dirname \
+	    $$(cabal list-bin $(PKGDISTR) --builddir="$(BUILDDIR)")):$$PATH; \
 	fi; \
 	$(NHMTOOL) deps $(PKGNAME) -d "$(BUILDDIR)" >> $(GHCENV); \
 	runhaskell --ghc-arg=-package=base \

diff --git a/test/Subrequest/Makefile b/test/Subrequest/Makefile
@@ -34,7 +34,8 @@ ifeq ($(INPLACE),1)
 endif
 	sed -i 's/\(^package-id \)/--\1/' $(GHCENV)
 	if ! command -v $(NHMTOOL) >/dev/null; then \
-	  PATH=$$(dirname $$(cabal list-bin $(PKGDISTR))):$$PATH; \
+	  PATH=$$(dirname \
+	    $$(cabal list-bin $(PKGDISTR) --builddir="$(BUILDDIR)")):$$PATH; \
 	fi; \
 	$(NHMTOOL) deps $(PKGNAME) -d "$(BUILDDIR)" >> $(GHCENV); \
 	runhaskell --ghc-arg=-package=base \