diff options
| author | Ralph Giles <[email protected]> | 2010-10-20 14:36:40 -0700 |
|---|---|---|
| committer | Graydon Hoare <[email protected]> | 2010-10-21 16:06:21 -0700 |
| commit | c3879c19c2d5141d9f554687552c234b64b029c7 (patch) | |
| tree | cb56e648b26ba05dd6c342b17ec9e2e92c1991aa /src/Makefile | |
| parent | Update llvm version detection for the 2.8 release. (diff) | |
| download | rust-c3879c19c2d5141d9f554687552c234b64b029c7.tar.xz rust-c3879c19c2d5141d9f554687552c234b64b029c7.zip | |
Also search the bare ocaml standard library path for llvm bindings.
Ubuntu ships the llvm bindings in /usr/lib/ocaml/llvm/ but Fedora
is installing them directly in /usr/lib/ocaml so we need to check
there as well.
The patch is untested; Fedora 14, the current beta, includes llvm 2.7.
It does add an unnecessary -I directive, but should at least have a
better chance of working on Fedora 15.
(cherry picked from commit 8af7360bd3de851668a133ae6ba4419e3722c6aa)
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Makefile b/src/Makefile index 9984393a..f7a1e116 100644 --- a/src/Makefile +++ b/src/Makefile @@ -183,6 +183,7 @@ ifneq ($(CFG_LLVM_CONFIG),) $(shell ocamlc$(OPT) -config | grep standard_library:)) CFG_OCAML_LLVM := $(shell \ for path in $(shell $(CFG_LLVM_CONFIG) --libdir)/ocaml \ + $(CFG_OCAML_LIBPATH) \ $(CFG_OCAML_LIBPATH)/llvm \ $(CFG_OCAML_LIBPATH)/llvm-$(CFG_LLVM_VERSION) ; do \ if test -e $${path}/llvm.cma; then echo $${path}; break; fi \ |