[PATCH] D115403: [clang][driver] update the darwin driver to point to correct macho_embedded path

[Alex Lorenz via Phabricator via cfe-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rGb58bf76f97f4: [clang][driver] update the darwin driver to point to correct macho_embedded path (authored by arphaman).

Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D115403/new/

https://reviews.llvm.org/D115403

Files:
  clang/lib/Driver/ToolChains/Darwin.cpp
  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
  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


Index: clang/lib/Driver/ToolChains/Darwin.cpp
===================================================================
--- clang/lib/Driver/ToolChains/Darwin.cpp
+++ clang/lib/Driver/ToolChains/Darwin.cpp
@@ -1152,8 +1152,9 @@
   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);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D115403.406652.patch
Type: text/x-patch
Size: 686 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20220208/4bf2f511/attachment.bin>