diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-03-09 11:37:18 -0500 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-03-17 19:05:50 -0400 |
| commit | 84927818ee68c6826327abc26d4647fb56053fb7 (patch) | |
| tree | 108ab49003f77c80a1b2eeb755df44ecad416f22 /ghc.mk | |
| parent | 540fa6b2cff3802877ff56a47ab3611e33a9ac86 (diff) | |
| download | haskell-84927818ee68c6826327abc26d4647fb56053fb7.tar.gz | |
llvmGen: Accept range of LLVM versions
Previously we would support only one LLVM major version. Here we
generalize this to accept a range, taking this range to be LLVM 10 to 11,
as 11 is necessary for Apple M1 support. We also accept 12, as that is
what apple ships with BigSur on the M1.
Diffstat (limited to 'ghc.mk')
| -rw-r--r-- | ghc.mk | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -1079,7 +1079,7 @@ BIN_DIST_MK = $(BIN_DIST_PREP_DIR)/bindist.mk unix-binary-dist-prep: $(includes_1_H_CONFIG) $(includes_1_H_PLATFORM) $(includes_1_H_VERSION) $(call removeTrees,bindistprep/) "$(MKDIRHIER)" $(BIN_DIST_PREP_DIR) - set -e; for i in packages LICENSE compiler ghc rts libraries utils docs libffi includes driver mk rules Makefile aclocal.m4 config.sub config.guess install-sh llvm-targets llvm-passes ghc.mk inplace distrib/configure.ac distrib/README distrib/INSTALL; do ln -s ../../$$i $(BIN_DIST_PREP_DIR)/; done + set -e; for i in packages LICENSE compiler ghc rts libraries utils docs libffi includes driver mk rules Makefile m4 aclocal.m4 config.sub config.guess install-sh llvm-targets llvm-passes ghc.mk inplace distrib/configure.ac distrib/README distrib/INSTALL; do ln -s ../../$$i $(BIN_DIST_PREP_DIR)/; done echo "HADDOCK_DOCS = $(HADDOCK_DOCS)" >> $(BIN_DIST_MK) echo "BUILD_SPHINX_HTML = $(BUILD_SPHINX_HTML)" >> $(BIN_DIST_MK) echo "BUILD_SPHINX_PDF = $(BUILD_SPHINX_PDF)" >> $(BIN_DIST_MK) @@ -1172,12 +1172,13 @@ SRC_DIST_TESTSUITE_TARBALL = $(SRC_DIST_ROOT)/$(SRC_DIST_TESTSUITE_NAME). # # Files to include in source distributions # -SRC_DIST_GHC_DIRS = mk rules docs distrib bindisttest libffi includes \ +SRC_DIST_GHC_DIRS = mk m4 rules docs distrib bindisttest libffi includes \ utils docs rts compiler ghc driver libraries libffi-tarballs \ - hadrian + hadrian SRC_DIST_GHC_FILES += \ configure.ac config.guess config.sub configure \ - aclocal.m4 README.md ANNOUNCE HACKING.md INSTALL.md LICENSE Makefile \ + aclocal.m4 m4/ax_compare_version.m4 \ + README.md ANNOUNCE HACKING.md INSTALL.md LICENSE Makefile \ install-sh llvm-targets llvm-passes VERSION GIT_COMMIT_ID \ boot packages ghc.mk MAKEHELP.md |