https://codereview.appspot.com/6506087/diff/1/CMakeLists.txt File CMakeLists.txt (right): https://codereview.appspot.com/6506087/diff/1/CMakeLists.txt#newcode111 CMakeLists.txt:111: DESTINATION include This isn't the correct destination. These headers ...
12 years, 5 months ago
(2012-09-11 07:09:07 UTC)
#1
https://codereview.appspot.com/6506087/diff/1/CMakeLists.txt
File CMakeLists.txt (right):
https://codereview.appspot.com/6506087/diff/1/CMakeLists.txt#newcode111
CMakeLists.txt:111: DESTINATION include
This isn't the correct destination. These headers are essentially builtin
headers for the custom runtime. As such, they need to go whether Clang's builtin
headers do: lib/clang/<version>/include
https://codereview.appspot.com/6506087/diff/1/CMakeLists.txt#newcode122
CMakeLists.txt:122: set(CLANG_RUNTIME_LIB_DIR
lib/clang/${CLANG_VERSION}/lib/darwin)
You're likely going to need to do something similar to the builtin header
install rule does for 'lib' here...
Specifically, I think you'll need to lift 'lib/' into the below
'set_target_properties' invocations, and then in 'install' use
'lib${LLVM_LIBDIR_SUFFIX}'/
https://codereview.appspot.com/6506087/diff/1/CMakeLists.txt File CMakeLists.txt (right): https://codereview.appspot.com/6506087/diff/1/CMakeLists.txt#newcode111 CMakeLists.txt:111: DESTINATION include On 2012/09/11 07:09:07, chandlerc wrote: > This ...
12 years, 5 months ago
(2012-09-11 09:00:01 UTC)
#2
https://codereview.appspot.com/6506087/diff/1/CMakeLists.txt
File CMakeLists.txt (right):
https://codereview.appspot.com/6506087/diff/1/CMakeLists.txt#newcode111
CMakeLists.txt:111: DESTINATION include
On 2012/09/11 07:09:07, chandlerc wrote:
> This isn't the correct destination. These headers are essentially builtin
> headers for the custom runtime. As such, they need to go whether Clang's
builtin
> headers do: lib/clang/<version>/include
Done.
https://codereview.appspot.com/6506087/diff/1/CMakeLists.txt#newcode122
CMakeLists.txt:122: set(CLANG_RUNTIME_LIB_DIR
lib/clang/${CLANG_VERSION}/lib/darwin)
On 2012/09/11 07:09:07, chandlerc wrote:
> You're likely going to need to do something similar to the builtin header
> install rule does for 'lib' here...
>
> Specifically, I think you'll need to lift 'lib/' into the below
> 'set_target_properties' invocations, and then in 'install' use
> 'lib${LLVM_LIBDIR_SUFFIX}'/
Done.
https://codereview.appspot.com/6506087/diff/5/CMakeLists.txt File CMakeLists.txt (right): https://codereview.appspot.com/6506087/diff/5/CMakeLists.txt#newcode115 CMakeLists.txt:115: set(LIBCLANG_PATH lib/clang/${CLANG_VERSION}) On 2012/09/11 09:12:54, chandlerc wrote: > While ...
12 years, 5 months ago
(2012-09-11 09:34:10 UTC)
#4
https://codereview.appspot.com/6506087/diff/5/CMakeLists.txt
File CMakeLists.txt (right):
https://codereview.appspot.com/6506087/diff/5/CMakeLists.txt#newcode115
CMakeLists.txt:115: set(LIBCLANG_PATH lib/clang/${CLANG_VERSION})
On 2012/09/11 09:12:54, chandlerc wrote:
> While deeply confusing (and I'm sorry about that...) it's *this* 'lib' that
> needs the ${LLVM_LIBDIR_SUFFIX}
>
> as opposed to...
Done.
https://codereview.appspot.com/6506087/diff/5/CMakeLists.txt#newcode138
CMakeLists.txt:138: ${LIBCLANG_PATH}/lib${LLVM_LIBDIR_SUFFIX}/${LIBCLANG_OS_DIR}
On 2012/09/11 09:12:54, chandlerc wrote:
> This one, which doesn't.
>
> The *system*'s lib directory may be 'lib64' or 'lib32'. We install into
> 'lib64/clang/' in that case. Headers end up in 'lib64/clang/include' and
> libraries should end up in 'lib64/clang/lib/...'
Right. Sorry for misunderstanding...
Issue 6506087: [compiler-rt] support install in CMake build
(Closed)
Created 12 years, 5 months ago by samsonov
Modified 12 years, 5 months ago
Reviewers: chandlerc
Base URL: https://llvm.org/svn/llvm-project/compiler-rt/trunk/
Comments: 8