Skip to content

Commit 998a676

Browse files
finagolfinfinagolfin
authored
Merge pull request #81601 from finagolfin/droid
Fix standalone stdlib build on Unix and make some Android CI tweaks
2 parents 4ba91f2 + 17543c7 commit 998a676

File tree

3 files changed

+3
-91
lines changed

3 files changed

+3
-91
lines changed

‎stdlib/cmake/modules/SwiftSource.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -928,9 +928,9 @@ function(_compile_swift_files
928928
endif()
929929

930930
set(custom_env "PYTHONIOENCODING=UTF8")
931-
if(SWIFTFILE_IS_STDLIB OR
931+
if(SWIFT_INCLUDE_TOOLS AND (SWIFTFILE_IS_STDLIB OR
932932
# Linux "hosttools" build require builder's runtime before building the runtime.
933-
(BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS" AND SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD")
933+
(BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS" AND SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD"))
934934
)
935935
get_bootstrapping_swift_lib_dir(bs_lib_dir "${SWIFTFILE_BOOTSTRAPPING}")
936936
if(bs_lib_dir)

‎test/Frontend/default-search-paths.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
// APPLE-NOSTDLIBIMPORT-NEXT: [0] BUILD_DIR/lib/swift/macosx
3636
// APPLE-NOSTDLIBIMPORT-NEXT: (End of search path lists.)
3737

38-
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource) -target x86_64-unknown-linux-android -nostdlibimport -parse %s -Rmodule-loading 2>&1 | %FileCheck -check-prefix=ANDROID-NOSTDLIBIMPORT %s
38+
// RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk-nosource) -target x86_64-unknown-linux-android -nostdlibimport -parse -parse-stdlib %s -Rmodule-loading 2>&1 | %FileCheck -check-prefix=ANDROID-NOSTDLIBIMPORT %s
3939
// ANDROID-NOSTDLIBIMPORT: Implicit framework search paths:
4040
// ANDROID-NOSTDLIBIMPORT-NEXT: Runtime library import search paths:
4141
// ANDROID-NOSTDLIBIMPORT-NEXT: [0] BUILD_DIR/lib/swift/android

‎utils/windows-swift-android-lit-test-overrides.txt

Lines changed: 0 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -46,100 +46,18 @@ xfail Swift(android-aarch64) :: IDE/complete_with_visible_members.swift
4646
xfail Swift(android-aarch64) :: IDE/print_opaque_result_type.swift
4747
xfail Swift(android-aarch64) :: IDE/rdar141440011.swift
4848
xfail Swift(android-aarch64) :: Index/Store/output-failure.swift
49-
xfail Swift(android-aarch64) :: Interop/Cxx/class/access/private-fileid-diagnostics.swift
50-
xfail Swift(android-aarch64) :: Interop/Cxx/class/closure-thunk-irgen.swift
5149
xfail Swift(android-aarch64) :: Interop/Cxx/class/constructors-copy-irgen-android.swift
5250
xfail Swift(android-aarch64) :: Interop/Cxx/class/constructors-irgen-android.swift
5351
xfail Swift(android-aarch64) :: Interop/Cxx/class/destructors-correct-abi-irgen.swift
54-
xfail Swift(android-aarch64) :: Interop/Cxx/class/function-call-irgen.swift
55-
xfail Swift(android-aarch64) :: Interop/Cxx/foreign-reference/inheritance-diagnostics.swift
5652
xfail Swift(android-aarch64) :: Interop/Cxx/stdlib/android-and-std-module.swift
5753
xfail Swift(android-aarch64) :: Interop/Cxx/union/anonymous-union-partly-invalid.swift
5854
xfail Swift(android-aarch64) :: Interop/CxxToSwiftToCxx/bridge-cxx-struct-back-to-cxx.swift
5955
xfail Swift(android-aarch64) :: Interop/CxxToSwiftToCxx/link-cxx-type-metadata-accessor.swift
60-
xfail Swift(android-aarch64) :: Interop/SwiftToC/functions/swift-primitive-functions-c-bridging.swift
61-
xfail Swift(android-aarch64) :: Interop/SwiftToC/structs/large-structs-pass-return-indirect-in-c.swift
62-
xfail Swift(android-aarch64) :: Interop/SwiftToC/structs/small-structs-64-bit-pass-return-direct-in-c.swift
63-
xfail Swift(android-aarch64) :: Interop/SwiftToC/structs/small-structs-pass-return-direct-in-c.swift
64-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/class/nested-classes-in-cxx.swift
65-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/class/swift-actor-in-cxx.swift
66-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/class/swift-class-availability-in-cxx.swift
67-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/class/swift-class-in-cxx.swift
68-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/class/swift-class-inheritance-in-cxx.swift
69-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/class/swift-class-ordering.swift
70-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/class/swift-class-static-variables.swift
71-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/class/swift-class-virtual-method-dispatch.swift
72-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/class/swift-resilient-class-virtual-method-dispatch.swift
73-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/class/swift-subclass-of-resilient-class-virtual-method-dispatch.swift
74-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/core/swift-impl-defs-in-cxx-64-bit.swift
75-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/core/swift-impl-defs-in-cxx.swift
7656
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/core/validate-swift-impl-defs-in-cxx.cpp
77-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/cross-module-refs/do-not-expose-imported-api-by-default.swift
78-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/cross-module-refs/imported-enum-refs-in-cxx.swift
79-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/cross-module-refs/imported-struct-refs-in-cxx.swift
80-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/cross-module-refs/not-referenced-cross-module-import.swift
81-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/enums/enum-associated-value-class-type-cxx.swift
82-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/enums/enum-member-param-no-shadow-case.swift
83-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/enums/large-enums-pass-return-in-cxx.swift
84-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/enums/resilient-enum-in-cxx.swift
85-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/enums/small-enums-generated-stub-64bit.swift
86-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/enums/small-enums-pass-return-in-cxx.swift
87-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/enums/swift-enum-implementation.swift
88-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/expose-attr/expose-rename-to-unavailable-decl.swift
89-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/expose-attr/expose-swift-decls-to-cxx.swift
90-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/extension/struct-extension-in-cxx.swift
91-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/cdecl.swift
92-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/function-availability.swift
93-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/swift-function-argument-keyword-in-cxx.swift
94-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/swift-function-overloads.swift
95-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/swift-function-unsupported-cxx-type.swift
96-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/swift-functions.swift
97-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/swift-no-expose-unsupported-alwaysEmitInClient-func.swift
98-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/swift-no-expose-unsupported-async-func.swift
99-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/swift-operators.swift
100-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/swift-primitive-functions-cxx-bridging.swift
101-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/swift-primitive-inout-functions-cxx-bridging.swift
102-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/swift-simd-vector-functions-cxx-bridging.swift
103-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/functions/swift-transparent-functions-cxx-bridging.swift
104-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/generics/generic-enum-in-cxx.swift
10557
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/generics/generic-function-cxx-type-invalid.cpp
106-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/generics/generic-function-in-cxx.swift
10758
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/generics/generic-struct-as-generic-func-arg-in-cpp.swift
108-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/generics/generic-struct-in-cxx.swift
109-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/generics/generic-struct-known-layout-direct-in-cxx.swift
110-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/generics/generic-struct-known-layout-indirect-in-cxx.swift
11159
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/generics/generic-type-cxx-type-invalid.cpp
112-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/generics/generic-type-traits-fwd.swift
113-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/initializers/init-in-cxx.swift
114-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/initializers/swift-init-availability-in-cxx.swift
115-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/macros/macro-name-collision.swift
116-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/methods/method-in-cxx.swift
117-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/methods/mutating-method-in-cxx.swift
118-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/methods/swift-method-availability-in-cxx.swift
119-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/module/module-to-namespace.swift
120-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/ownership/consuming-parameter-in-cxx.swift
121-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/properties/bool-is-has-in-cxx.swift
122-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/properties/getter-in-cxx.swift
123-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/properties/setter-in-cxx.swift
124-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/properties/swift-property-availability-in-cxx.swift
125-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/stdlib/combination-of-stdlib-generics-in-cxx.swift
126-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/stdlib/optional/optional-in-cxx.swift
127-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/stdlib/stdlib-dep-inline-in-cxx.swift
12860
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/stdlib/stdlib-in-cxx-no-diagnostics-generated-header.cpp
129-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/stdlib/swift-stdlib-in-cxx.swift
130-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/structs/large-structs-pass-return-indirect-in-cxx.swift
131-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/structs/nested-structs-in-cxx.swift
132-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/structs/resilient-struct-in-cxx.swift
133-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/structs/small-structs-pass-return-direct-in-cxx.swift
134-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/structs/struct-with-opaque-layout-resilient-member-in-cxx.swift
135-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/structs/struct-with-refcounted-member.swift
136-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/structs/swift-struct-availability-in-cxx.swift
137-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/structs/swift-struct-circular-dependent-defs.swift
138-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/structs/swift-struct-in-cxx.swift
139-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/unsupported/unsupported-enums-in-cxx.swift
140-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/unsupported/unsupported-funcs-in-cxx.swift
141-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/unsupported/unsupported-generics-in-cxx.swift
142-
xfail Swift(android-aarch64) :: Interop/SwiftToCxx/unsupported/unsupported-types-in-cxx.swift
14361
xfail Swift(android-aarch64) :: Interop/SwiftToCxxToSwift/hide-swift-module-namespace-in-swift.swift
14462
xfail Swift(android-aarch64) :: Interop/SwiftToCxxToSwift/import-swift-class-back-to-swift.swift
14563
xfail Swift(android-aarch64) :: ModuleInterface/BadStdlib.swiftinterface
@@ -149,7 +67,6 @@ xfail Swift(android-aarch64) :: ModuleInterface/swift_build_sdk_interfaces/check
14967
xfail Swift(android-aarch64) :: ModuleInterface/swift_build_sdk_interfaces/compiler-uses-prebuilt-envvar.swift
15068
xfail Swift(android-aarch64) :: ModuleInterface/swift_build_sdk_interfaces/compiler-uses-prebuilt.swift
15169
xfail Swift(android-aarch64) :: ModuleInterface/swift_build_sdk_interfaces/track-system-dependencies.swift
152-
xfail Swift(android-aarch64) :: SIL/clang-function-types-android.swift
15370
xfail Swift(android-aarch64) :: SILGen/magic_identifier_file_conflicting.swift.gyb
15471
xfail Swift(android-aarch64) :: ScanDependencies/can_import_with_map.swift
15572
xfail Swift(android-aarch64) :: ScanDependencies/cannot_import_with_map_duplicate_entries.swift
@@ -191,7 +108,6 @@ xfail Swift(android-aarch64) :: api-digester/macro-gen-json.swift
191108
xfail Swift(android-aarch64) :: api-digester/macro-gen.swift
192109
xfail Swift(android-aarch64) :: sil-func-extractor/basic.sil
193110
xfail Swift(android-aarch64) :: sil-func-extractor/basic.swift
194-
xfail Swift(android-aarch64) :: stdlib/FloatConstants.swift
195111

196112
xfail Swift-validation(android-aarch64) :: BuildSystem/android_cross_compile.test
197113
xfail Swift-validation(android-aarch64) :: BuildSystem/build_lld.test
@@ -243,7 +159,3 @@ xfail Swift-validation(android-aarch64) :: Sema/type_checker_perf/slow/rdar91310
243159
xfail Swift-validation(android-aarch64) :: compiler_crashers_2_fixed/issue-56100.swift
244160
xfail Swift-validation(android-aarch64) :: compiler_scale/parse_array_nested.swift.gyb
245161
xfail Swift-validation(android-aarch64) :: execution/unavailable_decls.swift
246-
247-
skip Swift(android-aarch64) :: Driver/parseable_output.swift
248-
skip Swift(android-aarch64) :: Driver/parseable_output_unicode.swift
249-
skip Swift-validation(android-aarch64) :: compiler_crashers_fixed/28795-inprotocol-isrequirementsignaturecomputed-missing-signature.swift

0 commit comments

Comments
 (0)