This is an archive of the discontinued LLVM Phabricator instance.

Differential D100999

[lld-macho] Fix BUILD_SHARED_LIBS build
ClosedPublic

Authored by arichardson on Apr 21 2021, 2:59 PM.

Details

Reviewers
int3
thakis
gkm
Group Reviewers
Restricted Project
Commits
rG90344499ae76: [lld-macho] Fix BUILD_SHARED_LIBS build
Summary

ca6751043d8899b12baeb48621e61fb352cfee09 added a dependency on XAR (at
least for the shared libs build), so without this change we get the
following linker error:

Undefined symbols for architecture x86_64:

"_xar_close", referenced from:
    lld::macho::BitcodeBundleSection::finalize() in SyntheticSections.cpp.o

Diff Detail

Event Timeline

arichardson created this revision.Apr 21 2021, 2:59 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 21 2021, 2:59 PM
Herald added subscribers: pengfei, mgorny. · View Herald Transcript
arichardson requested review of this revision.Apr 21 2021, 2:59 PM
Herald added a project: Restricted Project. · View Herald TranscriptApr 21 2021, 2:59 PM
Herald added a subscriber: llvm-commits. · View Herald Transcript
int3 accepted this revision.Apr 21 2021, 3:22 PM

Thank you!

This revision is now accepted and ready to land.Apr 21 2021, 3:22 PM
Harbormaster completed remote builds in B100098: Diff 339397.Apr 21 2021, 3:31 PM
thakis added a comment.Apr 22 2021, 12:32 PM

we should remove it from lld/tools/lld/CMakeLists.txt then, rigth?

arichardson updated this revision to Diff 341147.Apr 28 2021, 4:30 AM

address review feedback

Harbormaster completed remote builds in B101379: Diff 341147.Apr 28 2021, 5:45 AM
thakis accepted this revision.Jun 3 2021, 11:27 AM

Do you have commit access or should I land this for you?

Herald added a reviewer: gkm. · View Herald TranscriptJun 3 2021, 11:27 AM
arichardson added a comment.Jun 3 2021, 11:39 AM

Sorry, forgot to commit this. Will do so now.

arichardson updated this revision to Diff 349631.Jun 3 2021, 11:58 AM

rebase after macro name change

This revision was landed with ongoing or failed builds.Jun 3 2021, 12:00 PM
Closed by commit rG90344499ae76: [lld-macho] Fix BUILD_SHARED_LIBS build (authored by arichardson). · Explain Why
This revision was automatically updated to reflect the committed changes.
arichardson added a commit: rG90344499ae76: [lld-macho] Fix BUILD_SHARED_LIBS build.
Harbormaster completed remote builds in B107509: Diff 349631.Jun 3 2021, 12:40 PM

Revision Contents

PathSize
lld/
MachO/
4 lines
tools/
lld/
4 lines

Diff 349633

lld/MachO/CMakeLists.txt

Show First 20 Lines • Show All 49 Lines • ▼ Show 20 Linesadd_lld_library(lldMachO2
lldCommon lldCommon
${LLVM_PTHREAD_LIB} ${LLVM_PTHREAD_LIB}
${XAR_LIB} ${XAR_LIB}
DEPENDS DEPENDS
MachOOptionsTableGen MachOOptionsTableGen
${tablegen_deps} ${tablegen_deps}
) )
if(LLVM_HAVE_LIBXAR)
target_link_libraries(lldMachO2 PRIVATE ${XAR_LIB})
endif()

lld/tools/lld/CMakeLists.txt

Show All 14 Linestarget_link_libraries(lld
lldCOFF lldCOFF
lldDriver lldDriver
lldELF lldELF
lldMachO2 lldMachO2
lldMinGW lldMinGW
lldWasm lldWasm
) )
if(LLVM_HAVE_LIBXAR)
target_link_libraries(lld PRIVATE ${XAR_LIB})
endif()
install(TARGETS lld install(TARGETS lld
RUNTIME DESTINATION bin) RUNTIME DESTINATION bin)
if(NOT LLD_SYMLINKS_TO_CREATE) if(NOT LLD_SYMLINKS_TO_CREATE)
set(LLD_SYMLINKS_TO_CREATE set(LLD_SYMLINKS_TO_CREATE
lld-link ld.lld ld64.lld ld64.lld.darwinnew ld64.lld.darwinold wasm-ld) lld-link ld.lld ld64.lld ld64.lld.darwinnew ld64.lld.darwinold wasm-ld)
endif() endif()
foreach(link ${LLD_SYMLINKS_TO_CREATE}) foreach(link ${LLD_SYMLINKS_TO_CREATE})
add_lld_symlink(${link} lld) add_lld_symlink(${link} lld)
endforeach() endforeach()