Page MenuHomePhabricator

[zorg] [sanitizer] Update i686->i386 to match rename in compiler-rt
ClosedPublic

Authored by mgorny on Aug 28 2017, 11:52 AM.

Details

Summary

Update arch name used by the Android buildbot to reference "i386" rather
than "i686" since this is the only x86 library name post D26796 + D26764.
This is necessary so that the scripts push the correct library file.

Diff Detail

Repository
rL LLVM

Event Timeline

mgorny created this revision.Aug 28 2017, 11:52 AM
eugenis accepted this revision.Aug 28 2017, 12:49 PM
eugenis added inline comments.
zorg/buildbot/builders/sanitizers/buildbot_android.sh
80 ↗(On Diff #112929)

Btw could you move this comment to line 72?

This revision is now accepted and ready to land.Aug 28 2017, 12:49 PM
eugenis added inline comments.Aug 28 2017, 12:58 PM
zorg/buildbot/builders/sanitizers/buildbot_android.sh
68 ↗(On Diff #112929)

In fact, this might be wrong.
Ndk arch should be i686, unlike the standalone toolchain path.

mgorny added inline comments.Aug 28 2017, 1:00 PM
zorg/buildbot/builders/sanitizers/buildbot_android.sh
68 ↗(On Diff #112929)

FWICS ndk arch is actually 'x86' (the second argument). The first seems to be used only to construct the build directory path.

80 ↗(On Diff #112929)

Sure, will do.

eugenis added inline comments.Aug 28 2017, 1:03 PM
zorg/buildbot/builders/sanitizers/buildbot_android.sh
68 ↗(On Diff #112929)

Right. LGTM

This revision was automatically updated to reflect the committed changes.