Fix alwayslink in objc_import #15313
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When ObjcCommon was rewritten in Starlark in 4a0cc3b the `archives` list from objc_import (passed in via `extra_import_libraries`) got dropped from the `force_load_library` list in objc_provider. This commit adds them back so `-force_load` is correctly applied when `alwayslink` is set.
|
Any chance we can get this reviewed soon? Hopefully, this is a very straightforward fix. Let me know if you have questions! |
|
Sorry for the delay. I'll review and import it. |
googlewalt
approved these changes
Jun 15, 2022
|
@bazel-io flag |
bazel-io
added
the
potential release blocker
|
@bazel-io fork 5.3.0 |
bazel-io
removed
the
potential release blocker
ckolli5
added a commit
that referenced
this pull request
Jun 22, 2022
When `ObjcCommon` was rewritten in Starlark in 4a0cc3b the `archives` list from `objc_import` (passed in via `extra_import_libraries`) got dropped from the `force_load_library` list in `objc_provider`. This fix adds them back so `-force_load` is correctly applied when `alwayslink` is set. Here is the original Java implementation for reference: https://github.com/bazelbuild/bazel/blob/4a0cc3b3f297f8df60022ae977e170148a4c7ae4/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java#L415-L424 This `for` loop is what was omitted in the rewrite and is what is added in this PR: ```java for (Artifact archive : extraImportLibraries) { objcProvider.add(FORCE_LOAD_LIBRARY, archive); } ``` Closes #15313. PiperOrigin-RevId: 455164591 Change-Id: Icc0a5aab26ec150475d82b57549b263418776141 Co-authored-by: Krishna Ersson <kersson@butterflynetinc.com>
aranguyen
pushed a commit
to aranguyen/bazel
that referenced
this pull request
Jun 27, 2022
When `ObjcCommon` was rewritten in Starlark in 4a0cc3b the `archives` list from `objc_import` (passed in via `extra_import_libraries`) got dropped from the `force_load_library` list in `objc_provider`. This fix adds them back so `-force_load` is correctly applied when `alwayslink` is set. Here is the original Java implementation for reference: https://github.com/bazelbuild/bazel/blob/4a0cc3b3f297f8df60022ae977e170148a4c7ae4/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java#L415-L424 This `for` loop is what was omitted in the rewrite and is what is added in this PR: ```java for (Artifact archive : extraImportLibraries) { objcProvider.add(FORCE_LOAD_LIBRARY, archive); } ``` Closes bazelbuild#15313. PiperOrigin-RevId: 455164591 Change-Id: Icc0a5aab26ec150475d82b57549b263418776141
ShreeM01
removed
the
awaiting-review
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When
ObjcCommonwas rewritten in Starlark in 4a0cc3b thearchiveslist fromobjc_import(passed in viaextra_import_libraries) got dropped from theforce_load_librarylist inobjc_provider.This fix adds them back so
-force_loadis correctly applied whenalwayslinkis set.Here is the original Java implementation for reference:
bazel/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommon.java
Lines 415 to 424 in 4a0cc3b
This
forloop is what was omitted in the rewrite and is what is added in this PR: