diff options
| -rw-r--r-- | lib/Driver/ToolChains.cpp | 2 | ||||
| -rw-r--r-- | runtime/compiler-rt/Makefile | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp index 727cfbaa9b..b8d9639e9c 100644 --- a/lib/Driver/ToolChains.cpp +++ b/lib/Driver/ToolChains.cpp @@ -281,7 +281,7 @@ void MachO::AddLinkRuntimeLib(const ArgList &Args, ArgStringList &CmdArgs, StringRef DarwinStaticLib, bool AlwaysLink, bool IsEmbedded) const { SmallString<128> P(getDriver().ResourceDir); - llvm::sys::path::append(P, "lib", IsEmbedded ? "darwin_embedded" : "darwin", + llvm::sys::path::append(P, "lib", IsEmbedded ? "macho_embedded" : "darwin", DarwinStaticLib); // For now, allow missing resource libraries to support developers who may diff --git a/runtime/compiler-rt/Makefile b/runtime/compiler-rt/Makefile index f081e8a92e..b683fcdc8b 100644 --- a/runtime/compiler-rt/Makefile +++ b/runtime/compiler-rt/Makefile @@ -78,17 +78,17 @@ ifeq ($(shell test -d $(COMPILERRT_SRC_ROOT) && echo OK),OK) # support. RuntimeDirs := ifeq ($(OS),Darwin) -RuntimeDirs += darwin darwin_embedded +RuntimeDirs += darwin macho_embedded RuntimeLibrary.darwin.Configs := \ eprintf.a 10.4.a osx.a ios.a cc_kext.a cc_kext_ios5.a \ asan_osx_dynamic.dylib \ profile_osx.a profile_ios.a \ ubsan_osx.a -RuntimeLibrary.darwin_embedded.Configs := \ +RuntimeLibrary.macho_embedded.Configs := \ hard_static.a hard_pic.a ifneq (,$(findstring ARM,$(TARGETS_TO_BUILD))) -RuntimeLibrary.darwin_embedded.Configs += \ +RuntimeLibrary.macho_embedded.Configs += \ soft_static.a soft_pic.a endif |