jprdonnelly/impala
1
0
Fork 0
mirror of https://github.com/apache/impala.git synced 2025-12-19 18:12:08 -05:00
Code Issues Projects Releases Wiki Activity

Move IR cross compile output to a better folder for packaging.

Browse Source
This commit is contained in:
Nong Li
2012-05-31 14:00:21 -07:00
parent 406b2c6b1f
commit f9efe06649
5 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -20,3 +20,4 @@ cmake_install.cmake
CTestTestfile.cmake CTestTestfile.cmake
!CMakeLists.txt !CMakeLists.txt
Testing/ Testing/
llvm-ir/

2
be/CMakeLists.txt
View File

@@ -172,7 +172,7 @@ set (IMPALA_LINK_LIBS
# the build time for the tests is rather small and not worth the trouble. # the build time for the tests is rather small and not worth the trouble.
set (IMPALA_TEST_LINK_LIBS ${IMPALA_LINK_LIBS} gtest) set (IMPALA_TEST_LINK_LIBS ${IMPALA_LINK_LIBS} gtest)
set(LLVM_IR_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/build/llvm-ir") set(LLVM_IR_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/llvm-ir")
file(MAKE_DIRECTORY ${LLVM_IR_OUTPUT_DIRECTORY}) file(MAKE_DIRECTORY ${LLVM_IR_OUTPUT_DIRECTORY})
# compile these subdirs using their own CMakeLists.txt # compile these subdirs using their own CMakeLists.txt

2
be/src/codegen/llvm-codegen-test.cc
View File

@@ -118,7 +118,7 @@ TEST_F(LlvmCodeGenTest, ReplaceFnCall) {
typedef void (*TestLoopFn)(int); typedef void (*TestLoopFn)(int);
string module_file; string module_file;
PathBuilder::GetFullPath("testdata/llvm/test-loop.ir", &module_file); PathBuilder::GetFullPath("llvm-ir/test-loop.ir", &module_file);
// Part 1: Load the module and make sure everything is loaded correctly. // Part 1: Load the module and make sure everything is loaded correctly.
scoped_ptr<LlvmCodeGen> codegen; scoped_ptr<LlvmCodeGen> codegen;

2
be/src/codegen/llvm-codegen.cc
View File

@@ -113,7 +113,7 @@ Status LlvmCodeGen::LoadImpalaIR(ObjectPool* pool, scoped_ptr<LlvmCodeGen>* code
// TODO: is this how we want to pick up external files? Do we need better configuration // TODO: is this how we want to pick up external files? Do we need better configuration
// support? // support?
string module_file; string module_file;
PathBuilder::GetFullPath("be/build/llvm-ir/impala.ll", &module_file); PathBuilder::GetFullPath("llvm-ir/impala.ll", &module_file);
RETURN_IF_ERROR(LoadFromFile(pool, module_file, codegen_ret)); RETURN_IF_ERROR(LoadFromFile(pool, module_file, codegen_ret));
LlvmCodeGen* codegen = codegen_ret->get(); LlvmCodeGen* codegen = codegen_ret->get();

0
testdata/llvm/test-loop.ir → llvm-ir/test-loop.ir
View File