Skip to content

Commit c35d05c

Browse files
authored
Merge pull request #62511 from buttaface/droid
[android][test] Disable new C++ Interop test
2 parents 32f9396 + dc06fc0 commit c35d05c

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

test/Interop/Cxx/class/custom-new-operator-irgen.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// RUN: %target-swiftxx-frontend -I %S/Inputs %s -emit-ir | %FileCheck %s
22

3+
// XFAIL: OS=linux-android, OS=linux-androideabi
4+
35
import CustomNewOperator
46

57
var x = callsCustomNew()

utils/swift_build_support/swift_build_support/products/cmake_product.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,14 @@ def host_cmake_options(self, host_target):
159159
swift_cmake_options = cmake.CMakeOptions()
160160

161161
if host_target.startswith("android"):
162+
# Clang uses a different sysroot natively on Android in the Termux
163+
# app, which the Termux build scripts pass in through a $PREFIX
164+
# variable.
162165
prefix = os.environ.get("PREFIX")
163166
if prefix:
164167
llvm_cmake_options.define('DEFAULT_SYSROOT:STRING',
165168
os.path.dirname(prefix))
169+
llvm_cmake_options.define('CLANG_DEFAULT_LINKER:STRING', 'lld')
166170

167171
# Android doesn't support building all of compiler-rt yet.
168172
if not self.is_cross_compile_target(host_target):

0 commit comments

Comments
 (0)