This is an archive of the discontinued LLVM Phabricator instance.

[libcxxabi] Respect LIBCXXABI_LIBDIR_SUFFIX before an install
ClosedPublic

Authored by bcraig on Feb 18 2016, 1:31 PM.

Details

Summary

Prior to this patch, setting LIBCXXABI_LIBDIR_SUFFIX would confuse the check-libcxxabi target. libc++abi.* would get output to lib instead of lib${LIBCXXABI_LIBDIR_SUFFIX}, but the tests would look in the suffixed directory.

Now, we match what libcxx does, and set the CMAKE_*_OUTPUT_DIRECTORY to the LIBRARY_DIR. This is also being done in the "standalone" branch, but now it is being performed in the in-tree branch as well.

Diff Detail

Event Timeline

bcraig updated this revision to Diff 48395.Feb 18 2016, 1:31 PM
bcraig updated this revision to Diff 48396.
bcraig retitled this revision from to [libcxxabi] Respect LIBCXXABI_LIBDIR_SUFFIX before an install.
bcraig updated this object.
bcraig added a subscriber: cfe-commits.

Prior version doesn't apply to master. The context was dirty from some unsubmitted patches.

EricWF accepted this revision.Apr 15 2016, 6:53 PM
EricWF edited edge metadata.

So we already do this for the standalone builds but not for in-tree builds.
Before committing please make sure to remove the code on CMakeLists.txt line 99 that does this same thing.

I'm assuming changing these CMake variables doesn't propagate upwards to other in-tree projects?

My one concern is that libc++ won't be able to find libc++abi when it's in a custom directory.
But that shouldn't cause problems unless it's made to.

After all that this LGTM.

This revision is now accepted and ready to land.Apr 15 2016, 6:53 PM

So we already do this for the standalone builds but not for in-tree builds.
Before committing please make sure to remove the code on CMakeLists.txt line 99 that does this same thing.

Done

I'm assuming changing these CMake variables doesn't propagate upwards to other in-tree projects?

libcxx has an almost identical line in its top level CMakeLists.txt at the same scope. Seems that if it's ok there, it should be fine here.

bcraig closed this revision.Apr 18 2016, 6:36 AM

r266611