Skip to content

bpo-46263: Don't use MULTIARCH on FreeBSD #30410

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

Merged
tiran merged 2 commits into from
Jan 5, 2022
Merged

bpo-46263: Don't use MULTIARCH on FreeBSD #30410

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfdffc4
bpo-46263: Don't use MULTIARCH on FreeBSD
tiran Jan 5, 2022
a3b26e1
Print multiarch
tiran Jan 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Print multiarch
  • Loading branch information
@tiran
tiran committed Jan 5, 2022
commit a3b26e1c51c68800c33b4f8a9ebd111676d7eb0f
4 changes: 4 additions & 0 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6091,6 +6091,8 @@ $as_echo "none" >&6; }
fi
rm -f conftest.c conftest.out

{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for multiarch" >&5
$as_echo_n "checking for multiarch... " >&6; }
case $ac_sys_system in #(
Darwin*) :
MULTIARCH="" ;; #(
Expand All @@ -6101,6 +6103,8 @@ case $ac_sys_system in #(
;;
esac

{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MULTIARCH" >&5
$as_echo "$MULTIARCH" >&6; }

if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
Expand Down
2 changes: 2 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,12 +987,14 @@ else
fi
rm -f conftest.c conftest.out

AC_MSG_CHECKING([for multiarch])
AS_CASE([$ac_sys_system],
[Darwin*], [MULTIARCH=""],
[FreeBSD*], [MULTIARCH=""],
[MULTIARCH=$($CC --print-multiarch 2>/dev/null)]
)
AC_SUBST([MULTIARCH])
AC_MSG_RESULT([$MULTIARCH])

if test x$PLATFORM_TRIPLET != x && test x$MULTIARCH != x; then
if test x$PLATFORM_TRIPLET != x$MULTIARCH; then
Expand Down