nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-23 04:14:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disable llvm-config logic due to optimistic assumption of "having the ocaml bindings". Also add NO_LLVM override make-var, for good measure.

Browse Source
This commit is contained in:
Graydon Hoare 2010-07-10 19:58:02 -07:00
parent ab3921f27e
commit 5e0757f0ba
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Makefile
View File

@ -23,7 +23,11 @@ CFG_GCC_CFLAGS :=
CFG_GCC_LINK_FLAGS := CFG_GCC_LINK_FLAGS :=
CFG_VALGRIND := CFG_VALGRIND :=
CFG_LLVM_CONFIG := llvm-config # Issue #102, LLVM-config logic is assuming "presence of llvm-config"
# means "presence of ocaml bindings". Commenting out for now.
# CFG_LLVM_CONFIG := llvm-config
CFG_LLVM_CONFIG :=
CFG_BOOT_FLAGS := $(FLAGS) CFG_BOOT_FLAGS := $(FLAGS)
ifeq ($(CFG_OSTYPE), Linux) ifeq ($(CFG_OSTYPE), Linux)
@ -150,6 +154,10 @@ ifdef NO_VALGRIND
CFG_VALGRIND := CFG_VALGRIND :=
endif endif
ifdef NO_LLVM
CFG_LLVM_CONFIG :=
endif
ifneq ($(CFG_LLVM_CONFIG),) ifneq ($(CFG_LLVM_CONFIG),)
CFG_LLVM_CONFIG := $(shell which $(CFG_LLVM_CONFIG)) CFG_LLVM_CONFIG := $(shell which $(CFG_LLVM_CONFIG))
endif endif