Couple more fixes to move around llvm revisions

src/Makefile

@@ -80,11 +80,16 @@ else
 	LLVM_BIN := $(LLVM_BUILD)/Release/bin
 endif
 
-LLVM_LINK_LIBS := core mcjit native bitreader ipo irreader jit debuginfo instrumentation
+LLVM_LINK_LIBS := core mcjit native bitreader ipo irreader debuginfo instrumentation
 ifneq ($(ENABLE_INTEL_JIT_EVENTS),0)
 LLVM_LINK_LIBS += inteljitevents
 endif
 
+NEED_OLD_JIT := $(shell if [ $(LLVM_REVISION) -le 216982 ]; then echo 1; else echo 0; fi )
+ifeq ($(NEED_OLD_JIT),1)
+	LLVM_LINK_LIBS += jit
+endif
+
 LLVM_CXXFLAGS := $(shell $(LLVM_BUILD)/Release+Asserts/bin/llvm-config --cxxflags)
 LLVM_LDFLAGS := $(shell $(LLVM_BUILD)/Release+Asserts/bin/llvm-config --ldflags --libs $(LLVM_LINK_LIBS))
 LLVM_LIB_DEPS := $(wildcard $(LLVM_BUILD)/Release+Asserts/lib/*)

src/codegen/entry.cpp

@@ -186,7 +186,7 @@ void initCodegen() {
 #if LLVMREV < 215967
     llvm::EngineBuilder eb(new llvm::Module("empty_initial_module", g.context));
 #else
-    jlvm::EngineBuilder eb(std::unique_ptr<llvm::Module>(new llvm::Module("empty_initial_module", g.context)));
+    llvm::EngineBuilder eb(std::unique_ptr<llvm::Module>(new llvm::Module("empty_initial_module", g.context)));
 #endif
 
 #if LLVMREV < 216982