Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.

Commit adc9958

Browse files
authored
Merge pull request #915 from haskell/Tehnix-patch-1
Add GHC 8.4.4 support to all commands
2 parents 37f7350 + 4cef415 commit adc9958

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

Makefile

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ build-docs:
6868
stack --stack-yaml=stack-8.2.1.yaml exec hoogle generate \
6969
&& stack --stack-yaml=stack-8.2.2.yaml exec hoogle generate \
7070
&& stack --stack-yaml=stack-8.4.2.yaml exec hoogle generate \
71-
&& stack --stack-yaml=stack-8.4.3.yaml exec hoogle generate
71+
&& stack --stack-yaml=stack-8.4.3.yaml exec hoogle generate \
72+
&& stack --stack-yaml=stack-8.4.4.yaml exec hoogle generate
7273
.PHONY: build-docs
7374

7475

@@ -79,14 +80,16 @@ test: submodules
7980
stack --stack-yaml=stack-8.2.1.yaml test \
8081
&& stack --stack-yaml=stack-8.2.2.yaml test \
8182
&& stack --stack-yaml=stack-8.4.2.yaml test \
82-
&& stack --stack-yaml=stack-8.4.3.yaml test
83+
&& stack --stack-yaml=stack-8.4.3.yaml test \
84+
&& stack --stack-yaml=stack-8.4.4.yaml test
8385
.PHONY: test
8486

8587
build-copy-compiler-tool: submodules
8688
stack --stack-yaml=stack-8.2.1.yaml build --copy-compiler-tool \
8789
&& stack --stack-yaml=stack-8.2.2.yaml build --copy-compiler-tool \
8890
&& stack --stack-yaml=stack-8.4.2.yaml build --copy-compiler-tool \
89-
&& stack --stack-yaml=stack-8.4.3.yaml build --copy-compiler-tool
91+
&& stack --stack-yaml=stack-8.4.3.yaml build --copy-compiler-tool \
92+
&& stack --stack-yaml=stack-8.4.4.yaml build --copy-compiler-tool
9093
.PHONY: build-copy-compiler-tool
9194

9295
## Fixes icu related problems in MacOS
@@ -108,6 +111,9 @@ icu-macos-fix-build:
108111
--extra-lib-dirs=/usr/local/opt/icu4c/lib \
109112
--extra-include-dirs=/usr/local/opt/icu4c/include \
110113
&& stack --stack-yaml=stack-8.4.3.yaml build text-icu \
114+
--extra-lib-dirs=/usr/local/opt/icu4c/lib \
115+
--extra-include-dirs=/usr/local/opt/icu4c/include \
116+
&& stack --stack-yaml=stack-8.4.4.yaml build text-icu \
111117
--extra-lib-dirs=/usr/local/opt/icu4c/lib \
112118
--extra-include-dirs=/usr/local/opt/icu4c/include
113119
.PHONY: icu-macos-fix-build

0 commit comments

Comments
 (0)