This is an archive of the discontinued LLVM Phabricator instance.

Differential D115403

[clang][driver] update the darwin driver to point to correct macho_embedded path
ClosedPublic

Authored by arphaman on Dec 8 2021, 3:25 PM.

Details

Reviewers
bro4all
Ericson2314
ravikandhadai
Commits
rGb58bf76f97f4: [clang][driver] update the darwin driver to point to correct macho_embedded path
Summary

Compiler-rt started emitting the macho_embedded libraries in <resource_dir>/lib/darwin/macho_embedded in https://reviews.llvm.org/D105765 / 1e03c37b97b6176a60404d84665c40321f4e33a4

Diff Detail

Event Timeline

arphaman created this revision.Dec 8 2021, 3:25 PM
Herald added a subscriber: ributzka. · View Herald TranscriptDec 8 2021, 3:25 PM
arphaman requested review of this revision.Dec 8 2021, 3:25 PM
Herald added a project: Restricted Project. · View Herald TranscriptDec 8 2021, 3:25 PM
Ericson2314 accepted this revision.Dec 8 2021, 4:04 PM

Looks good. Thanks for fixing this for me!

This revision is now accepted and ready to land.Dec 8 2021, 4:04 PM
Harbormaster completed remote builds in B138300: Diff 392950.Dec 8 2021, 7:15 PM
Closed by commit rGb58bf76f97f4: [clang][driver] update the darwin driver to point to correct macho_embedded path (authored by arphaman). · Explain WhyFeb 7 2022, 4:51 PM
This revision was automatically updated to reflect the committed changes.
arphaman added a commit: rGb58bf76f97f4: [clang][driver] update the darwin driver to point to correct macho_embedded path.

Revision Contents

Diff 406652

clang/lib/Driver/ToolChains/Darwin.cpp

Show First 20 Lines • Show All 1,146 Lines • ▼ Show 20 Lines if (Component != "builtins") {
DarwinLibName += Component; DarwinLibName += Component;
if (!(Opts & RLO_IsEmbedded)) if (!(Opts & RLO_IsEmbedded))
DarwinLibName += "_"; DarwinLibName += "_";
} }
DarwinLibName += getOSLibraryNameSuffix(); DarwinLibName += getOSLibraryNameSuffix();
DarwinLibName += IsShared ? "_dynamic.dylib" : ".a"; DarwinLibName += IsShared ? "_dynamic.dylib" : ".a";
SmallString<128> Dir(getDriver().ResourceDir); SmallString<128> Dir(getDriver().ResourceDir);
llvm::sys::path::append( llvm::sys::path::append(Dir, "lib", "darwin");
Dir, "lib", (Opts & RLO_IsEmbedded) ? "macho_embedded" : "darwin"); if (Opts & RLO_IsEmbedded)
llvm::sys::path::append(Dir, "macho_embedded");
SmallString<128> P(Dir); SmallString<128> P(Dir);
llvm::sys::path::append(P, DarwinLibName); llvm::sys::path::append(P, DarwinLibName);
// For now, allow missing resource libraries to support developers who may // For now, allow missing resource libraries to support developers who may
// not have compiler-rt checked out or integrated into their build (unless // not have compiler-rt checked out or integrated into their build (unless
// we explicitly force linking with this library). // we explicitly force linking with this library).
if ((Opts & RLO_AlwaysLink) || getVFS().exists(P)) { if ((Opts & RLO_AlwaysLink) || getVFS().exists(P)) {
▲ Show 20 Lines • Show All 1,864 Lines • Show Last 20 Lines

clang/test/Driver/Inputs/resource_dir/lib/darwin/macho_embedded/libclang_rt.hard_pic.a

  • This file was moved from clang/test/Driver/Inputs/resource_dir/lib/macho_embedded/libclang_rt.hard_pic.a.
The contents of this file were not changed.

clang/test/Driver/Inputs/resource_dir/lib/darwin/macho_embedded/libclang_rt.hard_static.a

  • This file was moved from clang/test/Driver/Inputs/resource_dir/lib/macho_embedded/libclang_rt.hard_static.a.
The contents of this file were not changed.

clang/test/Driver/Inputs/resource_dir/lib/darwin/macho_embedded/libclang_rt.soft_pic.a

  • This file was moved from clang/test/Driver/Inputs/resource_dir/lib/macho_embedded/libclang_rt.soft_pic.a.
The contents of this file were not changed.

clang/test/Driver/Inputs/resource_dir/lib/darwin/macho_embedded/libclang_rt.soft_static.a

  • This file was moved from clang/test/Driver/Inputs/resource_dir/lib/macho_embedded/libclang_rt.soft_static.a.
The contents of this file were not changed.

clang/test/Driver/Inputs/resource_dir/lib/macho_embedded/libclang_rt.hard_pic.a

  • This file was moved to clang/test/Driver/Inputs/resource_dir/lib/darwin/macho_embedded/libclang_rt.hard_pic.a.

clang/test/Driver/Inputs/resource_dir/lib/macho_embedded/libclang_rt.hard_static.a

  • This file was moved to clang/test/Driver/Inputs/resource_dir/lib/darwin/macho_embedded/libclang_rt.hard_static.a.

clang/test/Driver/Inputs/resource_dir/lib/macho_embedded/libclang_rt.soft_pic.a

  • This file was moved to clang/test/Driver/Inputs/resource_dir/lib/darwin/macho_embedded/libclang_rt.soft_pic.a.

clang/test/Driver/Inputs/resource_dir/lib/macho_embedded/libclang_rt.soft_static.a

  • This file was moved to clang/test/Driver/Inputs/resource_dir/lib/darwin/macho_embedded/libclang_rt.soft_static.a.