Skip to content

[TF] install_name_dir workaround for Python and TensorFlow modules. #25328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 12, 2019
Merged

[TF] install_name_dir workaround for Python and TensorFlow modules. #25328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion stdlib/public/Python/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,7 @@ add_swift_target_library(swiftPython ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS
SWIFT_MODULE_DEPENDS_CYGWIN Glibc
SWIFT_MODULE_DEPENDS_HAIKU Glibc
SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}")
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
# NOTE: This is a workaround for https://github.com/apple/swift/pull/24382,
# which changed the default install_name_dir to `/usr/bin/swift`.
DARWIN_INSTALL_NAME_DIR "@rpath")
5 changes: 4 additions & 1 deletion stdlib/public/TensorFlow/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,4 +67,7 @@ add_swift_target_library(swiftTensorFlow ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_
SWIFT_COMPILE_FLAGS "${swift_stdlib_compile_flags}"
LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"
INSTALL_IN_COMPONENT stdlib
EXTRA_RPATHS "${SWIFT_TENSORFLOW_TARGET_LIB_DIR}")
EXTRA_RPATHS "${SWIFT_TENSORFLOW_TARGET_LIB_DIR}"
# NOTE: This is a workaround for https://github.com/apple/swift/pull/24382,
# which changed the default install_name_dir to `/usr/bin/swift`.
DARWIN_INSTALL_NAME_DIR "@rpath")