From 17387540ea89989b40eb55f1c78d6e0028e5eb4c Mon Sep 17 00:00:00 2001 From: Tony Kelman <tony@kelman.net> Date: Sun, 10 Jan 2016 02:59:14 -0500 Subject: [PATCH 1/7] DRY up deps/Makefile a tiny bit --- deps/Makefile | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/deps/Makefile b/deps/Makefile index 1d789d2c44a93..10c34250ae90c 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -347,29 +347,22 @@ LLVM_OBJ_SOURCE := $(LLVM_BUILD_DIR)/build_$(LLVM_BUILDTYPE)/$(LLVM_FLAVOR)/lib/ endif LLVM_OBJ_TARGET := $(build_libdir)/$(LLVM_LIB_FILE) -ifneq ($(LLVM_VER),svn) ifeq ($(LLVM_VER), 3.3) -LLVM_TAR:=$(SRCDIR)/srccache/llvm-$(LLVM_VER).src.tar.gz +LLVM_TAR_EXT:=$(LLVM_VER).src.tar.gz else -LLVM_TAR:=$(SRCDIR)/srccache/llvm-$(LLVM_VER).src.tar.xz -endif +LLVM_TAR_EXT:=$(LLVM_VER).src.tar.xz +endif # LLVM_VER == 3.3 + +ifneq ($(LLVM_VER),svn) +LLVM_TAR:=$(SRCDIR)/srccache/llvm-$(LLVM_TAR_EXT) ifeq ($(BUILD_LLDB),1) -ifeq ($(LLVM_VER), 3.3) -LLVM_LLDB_TAR:=$(SRCDIR)/srccache/lldb-$(LLVM_VER).src.tar.gz -else -LLVM_LLDB_TAR:=$(SRCDIR)/srccache/lldb-$(LLVM_VER).src.tar.xz -endif # LLVM_VER == 3.3 +LLVM_LLDB_TAR:=$(SRCDIR)/srccache/lldb-$(LLVM_TAR_EXT) endif # BUILD_LLDB ifeq ($(BUILD_LLVM_CLANG),1) -ifeq ($(LLVM_VER), 3.3) -LLVM_CLANG_TAR:=$(SRCDIR)/srccache/cfe-$(LLVM_VER).src.tar.gz -LLVM_COMPILER_RT_TAR:=$(SRCDIR)/srccache/compiler-rt-$(LLVM_VER).src.tar.gz -else -LLVM_CLANG_TAR:=$(SRCDIR)/srccache/cfe-$(LLVM_VER).src.tar.xz -LLVM_COMPILER_RT_TAR:=$(SRCDIR)/srccache/compiler-rt-$(LLVM_VER).src.tar.xz -endif # LLVM_VER +LLVM_CLANG_TAR:=$(SRCDIR)/srccache/cfe-$(LLVM_TAR_EXT) +LLVM_COMPILER_RT_TAR:=$(SRCDIR)/srccache/compiler-rt-$(LLVM_TAR_EXT) else LLVM_CLANG_TAR:= LLVM_COMPILER_RT_TAR:= @@ -377,7 +370,7 @@ LLVM_LIBCXX_TAR:= endif # BUILD_LLVM_CLANG ifeq ($(BUILD_CUSTOM_LIBCXX),1) -LLVM_LIBCXX_TAR:=$(SRCDIR)/srccache/libcxx-$(LLVM_VER).src.tar.gz +LLVM_LIBCXX_TAR:=$(SRCDIR)/srccache/libcxx-$(LLVM_TAR_EXT) endif endif # LLVM_VER != svn From c33cec6db0c7c0adc1ef9535513c15e0a83a5912 Mon Sep 17 00:00:00 2001 From: Tony Kelman <tony@kelman.net> Date: Wed, 6 Jan 2016 14:06:01 -0800 Subject: [PATCH 2/7] LLVM 3.7.1! --- LICENSE.md | 4 ++-- Make.inc | 1 - Make.powerpc | 2 -- README.md | 2 +- deps/Versions.make | 2 +- deps/checksums/llvm-3.3.src.tar.gz/md5 | 1 - deps/checksums/llvm-3.3.src.tar.gz/sha512 | 1 - 7 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 deps/checksums/llvm-3.3.src.tar.gz/md5 delete mode 100644 deps/checksums/llvm-3.3.src.tar.gz/sha512 diff --git a/LICENSE.md b/LICENSE.md index 6c85df6ec2622..8b8c11bf748b5 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -29,7 +29,7 @@ for exceptions. Julia includes code from the following projects, which have their own licenses: - [LDC](https://github.com/ldc-developers/ldc/blob/master/LICENSE) (for ccall/cfunction ABI definitions) [BSD-3]. The portion of code that Julia uses from LDC is [BSD-3] licensed. -- [LLVM](http://llvm.org/releases/3.3/LICENSE.TXT) (for parts of src/jitlayers.cpp and src/disasm.cpp) [BSD-3, effectively] +- [LLVM](http://llvm.org/releases/3.7.0/LICENSE.TXT) (for parts of src/jitlayers.cpp and src/disasm.cpp) [BSD-3, effectively] - [MUSL](http://git.musl-libc.org/cgit/musl/tree/COPYRIGHT) (for getopt implementations on Windows) [MIT] - [NetBSD](http://www.netbsd.org/about/redistribution.html) (for setjmp, longjmp, and strptime implementations on Windows) [BSD-3] @@ -39,7 +39,7 @@ own licenses: - [FEMTOLISP](https://github.com/JeffBezanson/femtolisp) [BSD-3] - [LIBUNWIND](http://git.savannah.gnu.org/gitweb/?p=libunwind.git;a=blob_plain;f=LICENSE;hb=master) [MIT] - [LIBUV](https://github.com/joyent/libuv/blob/master/LICENSE) [MIT] -- [LLVM](http://llvm.org/releases/3.3/LICENSE.TXT) [BSD-3, effectively] +- [LLVM](http://llvm.org/releases/3.7.0/LICENSE.TXT) [BSD-3, effectively] - [UTF8PROC](https://github.com/JuliaLang/libmojibake) [MIT] diff --git a/Make.inc b/Make.inc index e8d3295e8eec2..78442b099b2f2 100644 --- a/Make.inc +++ b/Make.inc @@ -603,7 +603,6 @@ JCFLAGS += -fsigned-char LLVM_ASSERTIONS=1 #LLVM_FLAGS+="--with-float=hard --with-abi=aapcs-vfp" -LLVM_VER:=3.7.1 override USE_BLAS64:=0 override OPENBLAS_DYNAMIC_ARCH:=0 diff --git a/Make.powerpc b/Make.powerpc index ca1a198fb6123..d456036a6e4ec 100644 --- a/Make.powerpc +++ b/Make.powerpc @@ -24,8 +24,6 @@ ifeq ($(USE_SYSTEM_LLVM),1) LLVM_CONFIG=llvm-config-3.5 else LLVM_ASSERTIONS=1 -LLVM_VER=3.7.1 -LLVM_ASSERTIONS=1 endif # On a newly allocated machine, you'll need the following dependencies: diff --git a/README.md b/README.md index 1b270ed93a3f7..ed30bdc1d2877 100644 --- a/README.md +++ b/README.md @@ -267,7 +267,7 @@ Building Julia requires that the following software be installed: Julia uses the following external libraries, which are automatically downloaded (or in a few cases, included in the Julia source repository) and then compiled from source the first time you run `make`: -- **[LLVM]** (3.3) — compiler infrastructure. (3.4 not supported; 3.5+ mostly supported, [with caveats](https://github.com/JuliaLang/julia/issues/9336)) +- **[LLVM]** (3.7) — compiler infrastructure. - **[FemtoLisp]** — packaged with Julia source, and used to implement the compiler front-end. - **[libuv]** — portable, high-performance event-based I/O library - **[OpenLibm]** — portable libm library containing elementary math functions. diff --git a/deps/Versions.make b/deps/Versions.make index 380bce7f52b24..e96ccfbb93ced 100644 --- a/deps/Versions.make +++ b/deps/Versions.make @@ -1,4 +1,4 @@ -LLVM_VER = 3.3 +LLVM_VER = 3.7.1 LLVM_LIB_SUFFIX = PCRE_VER = 10.20 DSFMT_VER = 2.2.3 diff --git a/deps/checksums/llvm-3.3.src.tar.gz/md5 b/deps/checksums/llvm-3.3.src.tar.gz/md5 deleted file mode 100644 index 41e901cf95ea4..0000000000000 --- a/deps/checksums/llvm-3.3.src.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -40564e1dc390f9844f1711c08b08e391 diff --git a/deps/checksums/llvm-3.3.src.tar.gz/sha512 b/deps/checksums/llvm-3.3.src.tar.gz/sha512 deleted file mode 100644 index 0f4323d9b381f..0000000000000 --- a/deps/checksums/llvm-3.3.src.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -1b7f7c5e907a68f642dcbe48fdff9585cb1504022bc9d386f310ebe5d25103d0d5f7cf0abf19e0e3fd666970160a98c90033754e2b79b2fac0cf866c984f8038 From 4fd7dc191c97130b3da6688afc89b0369a23ea1f Mon Sep 17 00:00:00 2001 From: Elliot Saba <staticfloat@gmail.com> Date: Thu, 7 Jan 2016 01:11:01 -0800 Subject: [PATCH 3/7] Change OSX build to use LLVM3.7 Use `staging` branch for testing LLVM3.7 More git-fu More git-fu Hopefully the last git-fu llvm-config-3.7.1, not llvm-config-3.7 --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f60dad408ec63..c4c6ad462ec2b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -63,8 +63,7 @@ before_install: brew tap staticfloat/julia; brew rm --force $(brew deps --HEAD julia); brew install -v --only-dependencies --HEAD julia; - brew install -v llvm33-julia; - BUILDOPTS="-j3 USECLANG=1 LLVM_CONFIG=$(brew --prefix llvm33-julia)/bin/llvm-config-3.3 VERBOSE=1 USE_BLAS64=0 SUITESPARSE_INC=-I$(brew --prefix suite-sparse-julia)/include FORCE_ASSERTIONS=1 STAGE2_DEPS=utf8proc"; + BUILDOPTS="-j3 USECLANG=1 LLVM_CONFIG=$(brew --prefix llvm37-julia)/bin/llvm-config-3.7.1 VERBOSE=1 USE_BLAS64=0 SUITESPARSE_INC=-I$(brew --prefix suite-sparse-julia)/include FORCE_ASSERTIONS=1 STAGE2_DEPS=utf8proc"; BUILDOPTS="$BUILDOPTS LIBBLAS=-lopenblas LIBBLASNAME=libopenblas LIBLAPACK=-lopenblas LIBLAPACKNAME=libopenblas"; for lib in LLVM SUITESPARSE ARPACK BLAS FFTW LAPACK GMP MPFR PCRE LIBUNWIND LIBGIT2; do export BUILDOPTS="$BUILDOPTS USE_SYSTEM_$lib=1"; From 74811feaac70b555f0da553443b71b55a859d10c Mon Sep 17 00:00:00 2001 From: Tony Kelman <tony@kelman.net> Date: Sun, 10 Jan 2016 14:46:40 -0800 Subject: [PATCH 4/7] Adjust AppVeyor to use LLVM 3.7.1 --- appveyor.yml | 4 ++-- contrib/windows/msys_build.sh | 6 +----- deps/checksums/llvm-3.3-i686-w64-mingw32-juliadeps.7z/md5 | 1 - .../checksums/llvm-3.3-i686-w64-mingw32-juliadeps.7z/sha512 | 1 - deps/checksums/llvm-3.3-x86_64-w64-mingw32-juliadeps.7z/md5 | 1 - .../llvm-3.3-x86_64-w64-mingw32-juliadeps.7z/sha512 | 1 - .../llvm-3.7.1-i686-w64-mingw32-juliadeps-r03.7z/md5 | 1 + .../llvm-3.7.1-i686-w64-mingw32-juliadeps-r03.7z/sha512 | 1 + .../llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r03.7z/md5 | 1 + .../llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r03.7z/sha512 | 1 + 10 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 deps/checksums/llvm-3.3-i686-w64-mingw32-juliadeps.7z/md5 delete mode 100644 deps/checksums/llvm-3.3-i686-w64-mingw32-juliadeps.7z/sha512 delete mode 100644 deps/checksums/llvm-3.3-x86_64-w64-mingw32-juliadeps.7z/md5 delete mode 100644 deps/checksums/llvm-3.3-x86_64-w64-mingw32-juliadeps.7z/sha512 create mode 100644 deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r03.7z/md5 create mode 100644 deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r03.7z/sha512 create mode 100644 deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r03.7z/md5 create mode 100644 deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r03.7z/sha512 diff --git a/appveyor.yml b/appveyor.yml index ffbc60dfe2315..60a17c6983ede 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -31,8 +31,8 @@ cache: # Cache any downloads from sourceforge because it's really unreliable - i686-4.9.2-release-win32-sjlj-rt_v4-rev3.7z - x86_64-4.9.2-release-win32-seh-rt_v4-rev3.7z - - llvm-3.3-i686-w64-mingw32-juliadeps.7z - - llvm-3.3-x86_64-w64-mingw32-juliadeps.7z + - llvm-3.7.1-i686-w64-mingw32-juliadeps-r03.7z + - llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r03.7z build_script: # If there's a newer build queued for the same PR, cancel this one diff --git a/contrib/windows/msys_build.sh b/contrib/windows/msys_build.sh index b06e8be1c8517..678fd9f0830a8 100755 --- a/contrib/windows/msys_build.sh +++ b/contrib/windows/msys_build.sh @@ -118,11 +118,7 @@ if [ -z "$USEMSVC" ]; then fi export AR=${CROSS_COMPILE}ar - f=llvm-3.3-$ARCH-w64-mingw32-juliadeps.7z - # The MinGW binary version of LLVM doesn't include libgtest or libgtest_main - mkdir -p usr/lib - $AR cr usr/lib/libgtest.a - $AR cr usr/lib/libgtest_main.a + f=llvm-3.7.1-$ARCH-w64-mingw32-juliadeps-r03.7z else echo "override USEMSVC = 1" >> Make.user echo "override ARCH = $ARCH" >> Make.user diff --git a/deps/checksums/llvm-3.3-i686-w64-mingw32-juliadeps.7z/md5 b/deps/checksums/llvm-3.3-i686-w64-mingw32-juliadeps.7z/md5 deleted file mode 100644 index 352dbfc0a8fc2..0000000000000 --- a/deps/checksums/llvm-3.3-i686-w64-mingw32-juliadeps.7z/md5 +++ /dev/null @@ -1 +0,0 @@ -e10c7a38c00bd79925c5ca60668cdc04 diff --git a/deps/checksums/llvm-3.3-i686-w64-mingw32-juliadeps.7z/sha512 b/deps/checksums/llvm-3.3-i686-w64-mingw32-juliadeps.7z/sha512 deleted file mode 100644 index 1c93816157523..0000000000000 --- a/deps/checksums/llvm-3.3-i686-w64-mingw32-juliadeps.7z/sha512 +++ /dev/null @@ -1 +0,0 @@ -fea52f6b115767fea76fa501cf29e96922cba5a5738e21fd83ddf90754bacbdd811adb0579cdf3072b0165619c27097b957e3013cbb358c586c68cf8cf903622 diff --git a/deps/checksums/llvm-3.3-x86_64-w64-mingw32-juliadeps.7z/md5 b/deps/checksums/llvm-3.3-x86_64-w64-mingw32-juliadeps.7z/md5 deleted file mode 100644 index 583f1f3e80a5d..0000000000000 --- a/deps/checksums/llvm-3.3-x86_64-w64-mingw32-juliadeps.7z/md5 +++ /dev/null @@ -1 +0,0 @@ -311a181c91e3b176fe780e53bccbf445 diff --git a/deps/checksums/llvm-3.3-x86_64-w64-mingw32-juliadeps.7z/sha512 b/deps/checksums/llvm-3.3-x86_64-w64-mingw32-juliadeps.7z/sha512 deleted file mode 100644 index 0d2db90dc9239..0000000000000 --- a/deps/checksums/llvm-3.3-x86_64-w64-mingw32-juliadeps.7z/sha512 +++ /dev/null @@ -1 +0,0 @@ -6c34119a4c162afd6425d90b950115eaf87abfce99186cf4a593c69562871e66941542992cdaf96cdcd78e2dda0656b8b0aa0d3682a06ae9bfdfa33607402366 diff --git a/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r03.7z/md5 b/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r03.7z/md5 new file mode 100644 index 0000000000000..fdfecc5774437 --- /dev/null +++ b/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r03.7z/md5 @@ -0,0 +1 @@ +0ca00bce067fcd5250253cda895e2ebc diff --git a/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r03.7z/sha512 b/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r03.7z/sha512 new file mode 100644 index 0000000000000..7724161dd5f4e --- /dev/null +++ b/deps/checksums/llvm-3.7.1-i686-w64-mingw32-juliadeps-r03.7z/sha512 @@ -0,0 +1 @@ +e1a86a4d173bf0ea7e8bb8490fa8d332933ae9c1ba90cdf769945e225e2554b3cc0387156a7a38f5f97e637b5da23d1b06b57dbe2bb2aeb9504cb4e12f73dab4 diff --git a/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r03.7z/md5 b/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r03.7z/md5 new file mode 100644 index 0000000000000..e9b78eda5c34f --- /dev/null +++ b/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r03.7z/md5 @@ -0,0 +1 @@ +2f28c7608cfe6a7bf0e07bd87453701d diff --git a/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r03.7z/sha512 b/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r03.7z/sha512 new file mode 100644 index 0000000000000..d5a96e11bd8bc --- /dev/null +++ b/deps/checksums/llvm-3.7.1-x86_64-w64-mingw32-juliadeps-r03.7z/sha512 @@ -0,0 +1 @@ +644350781b69aa3be302c9acd6a616b6601236941e26e022988e56017b42be5afdc1da98bcd8f3d4a706fd85481913ad83d16cd37aefd549f28405a596f5ce7c From 4b2b993c7752b05337144ba0603828bf2d98f8bd Mon Sep 17 00:00:00 2001 From: Tony Kelman <tony@kelman.net> Date: Sun, 10 Jan 2016 15:07:30 -0800 Subject: [PATCH 5/7] Build with -DUSE_ORCJIT on osx Travis since we know our llvm37-julia homebrew bottle is patched Add -DUSE_ORCJIT to default JCXXFLAGS rather than replacing --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index c4c6ad462ec2b..eb6cdf6fd2f91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,6 +68,7 @@ before_install: for lib in LLVM SUITESPARSE ARPACK BLAS FFTW LAPACK GMP MPFR PCRE LIBUNWIND LIBGIT2; do export BUILDOPTS="$BUILDOPTS USE_SYSTEM_$lib=1"; done; + echo JCXXFLAGS:='-pipe -fPIC -fno-rtti -DUSE_ORCJIT' >> Make.user; export LDFLAGS="-L$(brew --prefix openblas-julia)/lib -L$(brew --prefix suite-sparse-julia)/lib"; export DYLD_FALLBACK_LIBRARY_PATH="/usr/local/lib:/lib:/usr/lib:$(brew --prefix openblas-julia)/lib:$(brew --prefix suite-sparse-julia)/lib:$(brew --prefix arpack-julia)/lib"; make $BUILDOPTS -C contrib -f repackage_system_suitesparse4.make; From 0cc27d3dcac6823b369ca6bd685b977a78c21b37 Mon Sep 17 00:00:00 2001 From: Tony Kelman <tony@kelman.net> Date: Wed, 13 Jan 2016 18:55:44 -0500 Subject: [PATCH 6/7] Disable osx travis for now Set CXXFLAGS=-DUSE_ORCJIT --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index eb6cdf6fd2f91..26cac76a41a5c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,8 +29,8 @@ matrix: - bar - g++-5 - gfortran-5 - - os: osx - env: ARCH="x86_64" +# - os: osx # TODO: turn this back on once it's fast enough to not time out +# env: ARCH="x86_64" cache: directories: - $TRAVIS_BUILD_DIR/deps/srccache @@ -68,7 +68,7 @@ before_install: for lib in LLVM SUITESPARSE ARPACK BLAS FFTW LAPACK GMP MPFR PCRE LIBUNWIND LIBGIT2; do export BUILDOPTS="$BUILDOPTS USE_SYSTEM_$lib=1"; done; - echo JCXXFLAGS:='-pipe -fPIC -fno-rtti -DUSE_ORCJIT' >> Make.user; + export CXXFLAGS=-DUSE_ORCJIT; export LDFLAGS="-L$(brew --prefix openblas-julia)/lib -L$(brew --prefix suite-sparse-julia)/lib"; export DYLD_FALLBACK_LIBRARY_PATH="/usr/local/lib:/lib:/usr/lib:$(brew --prefix openblas-julia)/lib:$(brew --prefix suite-sparse-julia)/lib:$(brew --prefix arpack-julia)/lib"; make $BUILDOPTS -C contrib -f repackage_system_suitesparse4.make; From 7725b8e0a3c911a3c2d05289a7d49af7f479da71 Mon Sep 17 00:00:00 2001 From: Tony Kelman <tony@kelman.net> Date: Thu, 14 Jan 2016 00:50:08 -0500 Subject: [PATCH 7/7] disable libedit and terminfo in llvm configure (possibly temporary if we need these for something?) --- deps/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deps/Makefile b/deps/Makefile index 10c34250ae90c..fa2df33ef9eb9 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -380,7 +380,8 @@ LLVM_LDFLAGS := $(LDFLAGS) LLVM_TARGETS := host LLVM_TARGET_FLAGS := --enable-targets=$(LLVM_TARGETS) LLVM_CMAKE += -DLLVM_TARGETS_TO_BUILD:STRING="$(LLVM_TARGETS)" -DCMAKE_BUILD_TYPE="$(LLVM_BUILDTYPE)" -DLLVM_BUILD_LLVM_DYLIB:BOOL=ON -DLLVM_DYLIB_EXPORT_ALL:BOOL=ON -LLVM_FLAGS += --disable-profiling --enable-shared --enable-static $(LLVM_TARGET_FLAGS) --disable-bindings --disable-docs +LLVM_FLAGS += --disable-profiling --enable-shared --enable-static $(LLVM_TARGET_FLAGS) +LLVM_FLAGS += --disable-bindings --disable-docs --disable-libedit --disable-terminfo # LLVM has weird install prefixes (see llvm-$(LLVM_VER)/build_$(LLVM_BUILDTYPE)/Makefile.config for the full list) # We map them here to the "normal" ones, which means just prefixing "PROJ_" to the variable name. LLVM_MFLAGS := PROJ_libdir=$(build_libdir) PROJ_bindir=$(build_bindir) PROJ_includedir=$(build_includedir)