This is an archive of the discontinued LLVM Phabricator instance.

Restore clang_rt library name on i686-android.
ClosedPublic

Authored by eugenis on Aug 29 2017, 2:38 PM.

Details

Summary

Recent changes canonicalized clang_rt library names to refer to
"i386" on all x86 targets. Android historically uses i686.

This change adds a special case to keep i686 in all clang_rt
libraries when targeting Android.

Event Timeline

eugenis created this revision.Aug 29 2017, 2:38 PM
hans accepted this revision.Aug 29 2017, 2:51 PM

Thanks! Looks good to me.

clang/lib/Driver/ToolChain.cpp
308

Maybe add a comment here explaining that this is for historical reasons. Or in the cmake file below (or both).

This revision is now accepted and ready to land.Aug 29 2017, 2:51 PM
This revision was automatically updated to reflect the committed changes.
mgorny edited edge metadata.Aug 29 2017, 11:22 PM

Thanks a lot for taking care of this.