Skip to content

Commit

Permalink
Also search the bare ocaml standard library path for llvm bindings.
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
rillian committed Oct 20, 2010
1 parent b606b65 commit 8af7360
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit 8af7360

Please sign in to comment.