Skip to content

Commit

Permalink
Provide a build option USE_LLVM_SHLIB to help JuliaLang#2494
Browse files Browse the repository at this point in the history
  • Loading branch information
Viral B. Shah committed Oct 25, 2013
1 parent 86df1dc commit f19751c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
4 changes: 4 additions & 0 deletions Make.inc
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,13 @@ USE_SYSTEM_LIBUV=0
USE_MKL = 0
MKLLIB = $(MKLROOT)/lib/intel64

# Link to the LLVM shared library
USE_LLVM_SHLIB = 0

# Set to 1 to enable profiling with Intel VTune Amplifier
USE_INTEL_JITEVENTS = 0

# libc++ is standard on OS X 10.9, but not for earlier releases
USE_LIBCPP = 0

# we include twice to pickup user definitions better
Expand Down
8 changes: 7 additions & 1 deletion src/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
JULIAHOME = $(abspath ..)
include $(JULIAHOME)/Make.inc
include $(JULIAHOME)/deps/Versions.make

override CFLAGS += $(JCFLAGS)
override CXXFLAGS += $(JCXXFLAGS)
Expand All @@ -15,7 +16,12 @@ FLAGS = \
-I$(call exec,$(LLVM_CONFIG) --includedir) \
-I$(LIBUV_INC) -I$(JULIAHOME)/usr/include

LIBS = $(WHOLE_ARCHIVE) $(JULIAHOME)/src/flisp/libflisp.a $(WHOLE_ARCHIVE) $(JULIAHOME)/src/support/libsupport.a -L$(BUILD)/lib $(LIBUV) $(NO_WHOLE_ARCHIVE) $(call exec,$(LLVM_CONFIG) --libs) $(call exec,$(LLVM_CONFIG) --ldflags) $(OSLIBS)
LLVMLINK = $(call exec,$(LLVM_CONFIG) --libs)
ifeq ($(USE_LLVM_SHLIB),1)
LLVMLINK = -lLLVM-$(LLVM_VER)
endif

LIBS = $(WHOLE_ARCHIVE) $(JULIAHOME)/src/flisp/libflisp.a $(WHOLE_ARCHIVE) $(JULIAHOME)/src/support/libsupport.a -L$(BUILD)/lib $(LIBUV) $(NO_WHOLE_ARCHIVE) $(call exec,$(LLVM_CONFIG) --ldflags) $(LLVMLINK) $(OSLIBS)

ifneq ($(MAKECMDGOALS),debug)
TARGET =
Expand Down

0 comments on commit f19751c

Please sign in to comment.