Skip to content

[5.9][CMake] Add padding to RUNPATH in linux #2114

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

Jump to bottom
Merged
merged 1 commit into from
Aug 31, 2023
Merged

[5.9][CMake] Add padding to RUNPATH in linux #2114

merged 1 commit into from
Aug 31, 2023

Conversation

rintaro
Copy link
Member

@rintaro rintaro commented Aug 29, 2023 •
edited
Loading

Cherry-pick #2090 into release/5.9

  • Explanation: Companion of [5.9][CMake] Support Macros in Linux swift#68190. In the swift repository, swift-syntax libraries are copied to swift build directory, get the RUNPATH rewritten, and installed from there. To rewrite the RUNPATH, the initial length of it must be longer than the new RUNPATH. This PR add some padding to make enough room to be rewritten
  • Scope: Swift compiler build script
  • Risk: Low. This change itself just adds a non-harmful padding to the binary
  • Testing: Passes current test suite
  • Issue: rdar://104346187
  • Reviewer: Ben Barham (@bnbarham)

@rintaro
[CMake] Add padding to RUNPATH in linux
6958b66 
Shared libraries RUNPATH will be updated when they are copied to swift
build directory. CMake's 'file(SET_RPATH ...)' requires RUNPATH field
have enough lengh before updating.

(cherry picked from commit 7ecd25e)
@rintaro rintaro requested a review from ahoppen as a code owner August 29, 2023 17:49
@rintaro rintaro mentioned this pull request Aug 29, 2023
Merged
@rintaro
Copy link
Member Author

rintaro commented Aug 29, 2023

@swift-ci Please test

@rintaro rintaro mentioned this pull request Aug 29, 2023
Merged
@shahmishal shahmishal merged commit 4215ab9 into release/5.9 Aug 31, 2023
@shahmishal shahmishal deleted the 5.9-swift-swift-linux branch August 31, 2023 20:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bnbarham bnbarham bnbarham approved these changes

@ahoppen ahoppen Awaiting requested review from ahoppen ahoppen is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rintaro @bnbarham @shahmishal