diff --git a/lld/MachO/SyntheticSections.cpp b/lld/MachO/SyntheticSections.cpp --- a/lld/MachO/SyntheticSections.cpp +++ b/lld/MachO/SyntheticSections.cpp @@ -1460,8 +1460,15 @@ CodeSignatureSection::CodeSignatureSection() : LinkEditSection(segment_names::linkEdit, section_names::codeSignature) { align = 16; // required by libstuff - // FIXME: Consider using finalOutput instead of outputFile. - fileName = config->outputFile; + + // XXX: This mimics LD64, where it uses the install-name as codesign + // identifier, if available. + if (!config->installName.empty()) + fileName = config->installName; + else + // FIXME: Consider using finalOutput instead of outputFile. + fileName = config->outputFile; + size_t slashIndex = fileName.rfind("/"); if (slashIndex != std::string::npos) fileName = fileName.drop_front(slashIndex + 1); diff --git a/lld/test/MachO/adhoc-codesign.s b/lld/test/MachO/adhoc-codesign.s --- a/lld/test/MachO/adhoc-codesign.s +++ b/lld/test/MachO/adhoc-codesign.s @@ -77,6 +77,12 @@ # RUN: %no-arg-lld -arch arm64 -platform_version ios-simulator 14.0 15.0 -bundle -no_adhoc_codesign -o %t/out %t/foo-arm64-sim.o # RUN: llvm-objdump --macho --all-headers %t/out| FileCheck --check-prefix=NO-ADHOC %s +## FIXME: enable this test when we have tools similar to codesign +# RUN: %lld -arch x86_64 -dylib -o %t/out_installname.dylib -install_name @rpath/out_MyInstallName %t/foo-x86_64-macos.o +# RUN codesign -dv %t/out_installname.dylib | FileCheck --check-prefix=CS-ID %s +## Previously, LLD would use the output binary name. LD64, OTOH, uses [dylib]_install_name, if available. +# CS-ID: Identifier=out_MyInstallName + # ADHOC: cmd LC_CODE_SIGNATURE # ADHOC-NEXT: cmdsize 16