Page MenuHomePhabricator
Differential D17259

build: swap otool for (llvm-)objdump
ClosedPublic
Actions

Authored by Fabien on Fri, Nov 29, 23:00.

Details

Reviewers
PiRK
Group Reviewers
Restricted Project
Commits
rABC4c7d024ee4ad: build: swap otool for (llvm-)objdump
Summary
Similar to libtool, (llvm-)otool only exists with a version suffix
on some systems (Ubuntu), which makes it annoying to use/find. Avoid
this, by switching to objdump. Which is a drop-in replacement.

This is related to #21778, and the switchover to using vanilla LLVM for
macOS.

Backport of core#29739.

Depends on D17258.

Test Plan

Run the GUIX osx build

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

Fabien created this revision.Fri, Nov 29, 23:00
Herald added a reviewer: Restricted Project. · View Herald TranscriptFri, Nov 29, 23:00
Fabien requested review of this revision.Fri, Nov 29, 23:00
teamcity edited the summary of this revision. (Show Details)Fri, Nov 29, 23:00
Fabien added a comment.Fri, Nov 29, 23:01

@bot guix-osx

teamcity awarded a token.Fri, Nov 29, 23:01
Harbormaster completed remote builds in B31425: Diff 51263.Fri, Nov 29, 23:42
PiRK added a subscriber: PiRK.Sat, Nov 30, 07:58

OSX.cmake still has a find_program(CMAKE_OTOOL ${TOOLCHAIN_PREFIX}-otool) line. Is it still needed?

Fabien added a comment.Sat, Nov 30, 08:35
In D17259#391854, @PiRK wrote:

OSX.cmake still has a find_program(CMAKE_OTOOL ${TOOLCHAIN_PREFIX}-otool) line. Is it still needed?

It's removed in a follow-up I'm working on (PR21778)

PiRK accepted this revision.Sat, Nov 30, 08:36
This revision is now accepted and ready to land.Sat, Nov 30, 08:36
Closed by commit rABC4c7d024ee4ad: build: swap otool for (llvm-)objdump (authored by fanquake <fanquake@gmail.com>, committed by Fabien). · Explain WhySat, Nov 30, 11:06
This revision was automatically updated to reflect the committed changes.
Fabien added a commit: rABC4c7d024ee4ad: build: swap otool for (llvm-)objdump.

Revision Contents
Changeset List

PathSize
contrib/
macdeploy/
33 lines
depends/
builders/
4 lines
4 lines
hosts/
6 lines
2 lines
packages/
1 line
src/
qt/
6 lines

Diff 51272

View Options

contrib/macdeploy/macdeployqtplus.py

Loading...
View Options

depends/builders/darwin.mk

Loading...
View Options

depends/builders/default.mk

Loading...
View Options

depends/hosts/darwin.mk

Loading...
View Options

depends/hosts/default.mk

Loading...
View Options

depends/packages/native_llvm.mk

Loading...
View Options

src/qt/CMakeLists.txt

Loading...