[vmkit-commits] [vmkit] r183516 - For compiling VMKit, it is required to have complete LLVM source code. This

[Peter Senna Tschudin]

Author: peter.senna
Date: Fri Jun  7 06:59:55 2013
New Revision: 183516

URL: http://llvm.org/viewvc/llvm-project?rev=183516&view=rev
Log:
For compiling VMKit, it is required to have complete LLVM source code. This
patch adds the LLVM source dir as -I compilation option. The LLVM source code
location is found by calling llvm-config --src-root.


Modified:
    vmkit/trunk/Makefile.rules
    vmkit/trunk/lib/j3/Compiler/JavaJITCompiler.cpp
    vmkit/trunk/lib/vmkit/Compiler/JIT.cpp

Modified: vmkit/trunk/Makefile.rules
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/Makefile.rules?rev=183516&r1=183515&r2=183516&view=diff
==============================================================================
--- vmkit/trunk/Makefile.rules (original)
+++ vmkit/trunk/Makefile.rules Fri Jun  7 06:59:55 2013
@@ -36,7 +36,7 @@ LLC_FLAGS+=-disable-cfi -disable-fp-elim
 OPT_FLAGS+=-disable-cfi -disable-fp-elim 
 
 INCLUDES+=-I$(PROJ_SRC_CWD) -I$(PROJ_SRC_ROOT)/include -I$(PROJ_SRC_ROOT)/lib/vmkit/MMTk -I$(BUILD_DIR) \
-					-I$(shell $(LLVM_CONFIG) --includedir)
+					-I$(shell $(LLVM_CONFIG) --includedir) -I$(shell $(LLVM_CONFIG) --src-root)
 
 WARN_CFLAGS=  -Wall -Wno-long-long -Wno-variadic-macros -Wno-unused-private-field -Wno-unused-variable
 COMMON_CFLAGS+= $(INCLUDES) -ansi -pedantic $(WARN_CFLAGS) -fPIC \

Modified: vmkit/trunk/lib/j3/Compiler/JavaJITCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/Compiler/JavaJITCompiler.cpp?rev=183516&r1=183515&r2=183516&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/Compiler/JavaJITCompiler.cpp (original)
+++ vmkit/trunk/lib/j3/Compiler/JavaJITCompiler.cpp Fri Jun  7 06:59:55 2013
@@ -23,7 +23,7 @@
 #include "llvm/Support/Debug.h"
 #include "llvm/Support/raw_ostream.h"
 #include "llvm/DataLayout.h"
-#include <../lib/ExecutionEngine/JIT/JIT.h>
+#include <lib/ExecutionEngine/JIT/JIT.h>
 
 #include "VmkitGC.h"
 #include "vmkit/VirtualMachine.h"

Modified: vmkit/trunk/lib/vmkit/Compiler/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/Compiler/JIT.cpp?rev=183516&r1=183515&r2=183516&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/Compiler/JIT.cpp (original)
+++ vmkit/trunk/lib/vmkit/Compiler/JIT.cpp Fri Jun  7 06:59:55 2013
@@ -35,7 +35,7 @@
 #include <llvm/DataLayout.h>
 #include <llvm/Target/TargetMachine.h>
 #include <llvm/Target/TargetOptions.h>
-#include <../lib/ExecutionEngine/JIT/JIT.h>
+#include <lib/ExecutionEngine/JIT/JIT.h>
 
 #include "vmkit/JIT.h"
 #include "vmkit/Locks.h"