Author: Alex Lorenz Date: 2022-02-07T16:50:58-08:00 New Revision: b58bf76f97f4bffe91bcf673dcc1231c0cfc0921
URL: https://github.com/llvm/llvm-project/commit/b58bf76f97f4bffe91bcf673dcc1231c0cfc0921 DIFF: https://github.com/llvm/llvm-project/commit/b58bf76f97f4bffe91bcf673dcc1231c0cfc0921.diff LOG: [clang][driver] update the darwin driver to point to correct macho_embedded path Compiler-rt started emitting the macho_embedded libraries in `<resource_dir>/lib/darwin/macho_embedded` after https://reviews.llvm.org/D105765 / 1e03c37b97b6176a60404d84665c40321f4e33a4, so update the clang's driver to reflect that. Differential Revision: https://reviews.llvm.org/D115403 Added: clang/test/Driver/Inputs/resource_dir/lib/darwin/macho_embedded/libclang_rt.hard_pic.a clang/test/Driver/Inputs/resource_dir/lib/darwin/macho_embedded/libclang_rt.hard_static.a clang/test/Driver/Inputs/resource_dir/lib/darwin/macho_embedded/libclang_rt.soft_pic.a clang/test/Driver/Inputs/resource_dir/lib/darwin/macho_embedded/libclang_rt.soft_static.a Modified: clang/lib/Driver/ToolChains/Darwin.cpp Removed: clang/test/Driver/Inputs/resource_dir/lib/macho_embedded/libclang_rt.hard_pic.a clang/test/Driver/Inputs/resource_dir/lib/macho_embedded/libclang_rt.hard_static.a clang/test/Driver/Inputs/resource_dir/lib/macho_embedded/libclang_rt.soft_pic.a clang/test/Driver/Inputs/resource_dir/lib/macho_embedded/libclang_rt.soft_static.a ################################################################################ diff --git a/clang/lib/Driver/ToolChains/Darwin.cpp b/clang/lib/Driver/ToolChains/Darwin.cpp index f7da3f187814f..e71511747e44d 100644 --- a/clang/lib/Driver/ToolChains/Darwin.cpp +++ b/clang/lib/Driver/ToolChains/Darwin.cpp @@ -1152,8 +1152,9 @@ void MachO::AddLinkRuntimeLib(const ArgList &Args, ArgStringList &CmdArgs, DarwinLibName += getOSLibraryNameSuffix(); DarwinLibName += IsShared ? "_dynamic.dylib" : ".a"; SmallString<128> Dir(getDriver().ResourceDir); - llvm::sys::path::append( - Dir, "lib", (Opts & RLO_IsEmbedded) ? "macho_embedded" : "darwin"); + llvm::sys::path::append(Dir, "lib", "darwin"); + if (Opts & RLO_IsEmbedded) + llvm::sys::path::append(Dir, "macho_embedded"); SmallString<128> P(Dir); llvm::sys::path::append(P, DarwinLibName); diff --git a/clang/test/Driver/Inputs/resource_dir/lib/macho_embedded/libclang_rt.hard_pic.a b/clang/test/Driver/Inputs/resource_dir/lib/darwin/macho_embedded/libclang_rt.hard_pic.a similarity index 100% rename from clang/test/Driver/Inputs/resource_dir/lib/macho_embedded/libclang_rt.hard_pic.a rename to clang/test/Driver/Inputs/resource_dir/lib/darwin/macho_embedded/libclang_rt.hard_pic.a diff --git a/clang/test/Driver/Inputs/resource_dir/lib/macho_embedded/libclang_rt.hard_static.a b/clang/test/Driver/Inputs/resource_dir/lib/darwin/macho_embedded/libclang_rt.hard_static.a similarity index 100% rename from clang/test/Driver/Inputs/resource_dir/lib/macho_embedded/libclang_rt.hard_static.a rename to clang/test/Driver/Inputs/resource_dir/lib/darwin/macho_embedded/libclang_rt.hard_static.a diff --git a/clang/test/Driver/Inputs/resource_dir/lib/macho_embedded/libclang_rt.soft_pic.a b/clang/test/Driver/Inputs/resource_dir/lib/darwin/macho_embedded/libclang_rt.soft_pic.a similarity index 100% rename from clang/test/Driver/Inputs/resource_dir/lib/macho_embedded/libclang_rt.soft_pic.a rename to clang/test/Driver/Inputs/resource_dir/lib/darwin/macho_embedded/libclang_rt.soft_pic.a diff --git a/clang/test/Driver/Inputs/resource_dir/lib/macho_embedded/libclang_rt.soft_static.a b/clang/test/Driver/Inputs/resource_dir/lib/darwin/macho_embedded/libclang_rt.soft_static.a similarity index 100% rename from clang/test/Driver/Inputs/resource_dir/lib/macho_embedded/libclang_rt.soft_static.a rename to clang/test/Driver/Inputs/resource_dir/lib/darwin/macho_embedded/libclang_rt.soft_static.a _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
