[23.0 backport] scripts/build/plugins: don't override CGO_ENABLED set by .variables #5398
+7
−1
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.
The
.variables
setsCGO_ENABLED=1
on arm;cli/scripts/build/.variables
Lines 57 to 68 in b0c41b7
-buildmode=pie
;cli/scripts/build/.variables
Lines 79 to 88 in b0c41b7
But that looks to be conflicting with the hardcoded
CGO_ENABLED=0
in this script, which causes the build to fail on go1.22;This patch sets the CGO_ENABLED variable before sourcing
.variables
, so that other variables which are conditionally set are handled correctly.Before this PR:
With this PR:
(cherry picked from commit 9e29967)