Skip to content

Commit

Permalink
Do not pass -no-pie to the C compiler on musl/arm64 part 2 (ocaml#1…
Browse files Browse the repository at this point in the history
…1036)

Follow-up to 78539b5.  `aarch64` was used where `arm64` should have been used.

Co-authored-by: Kate <kit.ty.kate@disroot.org>
  • Loading branch information
2 people authored and EduardoRFS committed Mar 1, 2022
1 parent 48ccc53 commit c3ab8df
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Changes
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ Working version

### Bug fixes:

- #11025: Do not pass -no-pie to the C compiler on musl/arm64
(omni and Kate Deplaix, 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.14.0
----------------
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 @@ -1182,7 +1182,7 @@ AS_IF([test -z "$PARTIALLD"],
# e.g. Ubuntu >= 17.10 for i386, which uses the glibc dynamic loader.

AS_CASE([$arch],
[amd64|aarch64|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 c3ab8df

Please sign in to comment.