Skip to content

Commit 520f829

Browse files
authored
Merge pull request #4634 from s-ludwig/patch-1
Define CppRuntime_Clang when building for Android
2 parents 0d549a7 + e396273 commit 520f829

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

driver/main.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -852,6 +852,7 @@ void registerPredefinedTargetVersions() {
852852
if (triple.getEnvironment() == llvm::Triple::Android) {
853853
VersionCondition::addPredefinedGlobalIdent("Android");
854854
VersionCondition::addPredefinedGlobalIdent("CRuntime_Bionic");
855+
VersionCondition::addPredefinedGlobalIdent("CppRuntime_Clang");
855856
} else if (triple.isMusl()) {
856857
VersionCondition::addPredefinedGlobalIdent("CRuntime_Musl");
857858
VersionCondition::addPredefinedGlobalIdent("CppRuntime_Gcc");

runtime/druntime/src/core/stdcpp/new_.d

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ extern (C++, "std")
3939
{
4040
@nogc:
4141
///
42-
this() { super("bad allocation", 1); }
42+
extern(D) this() { super("bad allocation", 1); }
4343
}
4444
}
4545

0 commit comments

Comments
 (0)