Skip to content

Commit 1a9b904

Browse files
committed
Macho-embedded: rename compiler-rt support from Darwin-embedded
There's nothing Darwin-based in the files or target now, so the previous name is now misleading. llvm-svn: 199733
1 parent 4bf6078 commit 1a9b904

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

clang/lib/Driver/ToolChains.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ void MachO::AddLinkRuntimeLib(const ArgList &Args, ArgStringList &CmdArgs,
281281
StringRef DarwinStaticLib, bool AlwaysLink,
282282
bool IsEmbedded) const {
283283
SmallString<128> P(getDriver().ResourceDir);
284-
llvm::sys::path::append(P, "lib", IsEmbedded ? "darwin_embedded" : "darwin",
284+
llvm::sys::path::append(P, "lib", IsEmbedded ? "macho_embedded" : "darwin",
285285
DarwinStaticLib);
286286

287287
// For now, allow missing resource libraries to support developers who may

clang/runtime/compiler-rt/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,17 +78,17 @@ ifeq ($(shell test -d $(COMPILERRT_SRC_ROOT) && echo OK),OK)
7878
# support.
7979
RuntimeDirs :=
8080
ifeq ($(OS),Darwin)
81-
RuntimeDirs += darwin darwin_embedded
81+
RuntimeDirs += darwin macho_embedded
8282
RuntimeLibrary.darwin.Configs := \
8383
eprintf.a 10.4.a osx.a ios.a cc_kext.a cc_kext_ios5.a \
8484
asan_osx_dynamic.dylib \
8585
profile_osx.a profile_ios.a \
8686
ubsan_osx.a
8787

88-
RuntimeLibrary.darwin_embedded.Configs := \
88+
RuntimeLibrary.macho_embedded.Configs := \
8989
hard_static.a hard_pic.a
9090
ifneq (,$(findstring ARM,$(TARGETS_TO_BUILD)))
91-
RuntimeLibrary.darwin_embedded.Configs += \
91+
RuntimeLibrary.macho_embedded.Configs += \
9292
soft_static.a soft_pic.a
9393
endif
9494

0 commit comments

Comments
 (0)