mirror of
https://github.com/apple/swift.git
synced 2025-12-14 20:36:38 +01:00
43feb9cbe1
This changes the Swift resource directory from looking like
lib/
swift/
macosx/
libswiftCore.dylib
libswiftDarwin.dylib
x86_64/
Swift.swiftmodule
Swift.swiftdoc
Darwin.swiftmodule
Darwin.swiftdoc
to
lib/
swift/
macosx/
libswiftCore.dylib
libswiftDarwin.dylib
Swift.swiftmodule/
x86_64.swiftmodule
x86_64.swiftdoc
Darwin.swiftmodule/
x86_64.swiftmodule
x86_64.swiftdoc
matching the layout we use for multi-architecture swiftmodules
everywhere else (particularly frameworks).
There's no change in this commit to how Linux swiftmodules are
packaged. There's been past interest in going the /opposite/ direction
for Linux, since there's not standard support for fat
(multi-architecture) .so libraries. Moving the .so search path /down/
to an architecture-specific directory on Linux would allow the same
resource directory to be used for both host-compiling and
cross-compiling.
rdar://problem/43545560
27 lines
939 B
Swift
27 lines
939 B
Swift
// REQUIRES: OS=macosx
|
|
// RUN: %empty-directory(%t)
|
|
|
|
// RUN: echo 'int abc = 42;' | %clang -x c - -dynamiclib -Xlinker -install_name -Xlinker libabc.dylib -o %t/libabc.dylib
|
|
// RUN: echo 'int test() { extern int abc; return abc; }' | %clang -x c - -L%t -dynamiclib -labc -o %t/libfoo.dylib
|
|
|
|
// RUN: %swift_driver -I %S/Inputs/custom-modules -L%t %s | %FileCheck %s
|
|
// CHECK: {{okay}}
|
|
|
|
// Now test a dependency on a library in the compiler's resource directory.
|
|
// RUN: %empty-directory(%t/rsrc/%target-sdk-name)
|
|
// RUN: ln -s %t/libabc.dylib %t/rsrc/%target-sdk-name/
|
|
// RUN: ln -s %platform-module-dir/* %t/rsrc/%target-sdk-name/
|
|
// RUN: ln -s %platform-module-dir/../shims %t/rsrc/
|
|
// RUN: %empty-directory(%t/other)
|
|
// RUN: ln -s %t/libfoo.dylib %t/other
|
|
|
|
// RUN: %swift_driver -I %S/Inputs/custom-modules -L%t/other -resource-dir %t/rsrc/ %s | %FileCheck %s
|
|
|
|
import foo
|
|
|
|
if test() == 42 {
|
|
print("okay")
|
|
} else {
|
|
print("problem")
|
|
}
|