Skip to content

Commit

Permalink
Do not pass -no-pie to the C compiler on musl/arm64 part 2 (#11036)
Browse files Browse the repository at this point in the history
Follow-up to 78539b5.  `aarch64` was used where `arm64` should have been used.

Co-authored-by: Kate <kit.ty.kate@disroot.org>
(cherry picked from commit 2422a59)
  • Loading branch information
anmonteiro authored and Octachron committed Feb 28, 2022
1 parent 56c9302 commit 25478af
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions Changes
Original file line number Diff line number Diff line change
Expand Up @@ -488,6 +488,9 @@ OCaml 4.14.0
(Fabrice Buoro, with help from Stephen Dolan, Tom Kelly and Mark Shinwell,
review by Xavier Leroy)

- #11025, #11036: Do not pass -no-pie to the C compiler on musl/arm64
(omni, Kate Deplaix and Antonio Nuno Monteiro, review by Xavier Leroy)

OCaml 4.13 maintenance branch
-----------------------------

Expand Down
2 changes: 1 addition & 1 deletion configure

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1196,7 +1196,7 @@ AS_IF([test -z "$PARTIALLD"],
# e.g. Ubuntu >= 17.10 for i386, which uses the glibc dynamic loader.

AS_CASE([$arch],
[amd64|s390x|none],
[amd64|arm64|s390x|none],
# ocamlopt generates PIC code or doesn't generate code at all
[],
[AS_CASE([$host],
Expand Down

0 comments on commit 25478af

Please sign in to comment.