Skip to content
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

Jump to bottom

added MSYSTEM=ARM64 case in /etc/profile #6

Closed
wants to merge 4 commits into from
Closed

added MSYSTEM=ARM64 case in /etc/profile #6

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5ffc0d
added MSYSTEM=ARM64 case in /etc/profile
tommyvct Dec 21, 2020
be64d64
updated mingw32 path
tommyvct Dec 21, 2020
0941691
changed MINGW_MOUNT_POINT to /arm64
tommyvct Dec 29, 2020
135af65
added MSYSTEM=ARM64 case in /etc/profile
tommyvct Dec 29, 2020
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
7 changes: 7 additions & 0 deletions etc/profile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,13 @@ MINGW64)
ACLOCAL_PATH="${MINGW_MOUNT_POINT}/share/aclocal:/usr/share/aclocal"
MANPATH="${MINGW_MOUNT_POINT}/local/man:${MINGW_MOUNT_POINT}/share/man:${MANPATH}"
;;
ARM64)
MINGW_MOUNT_POINT="${MINGW_PREFIX}"
Copy link

@dennisameling dennisameling Dec 28, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MINGW_PREFIX is empty on my arm64 test build 🤷🏼‍♂️

I saw some references to MINGW_PREFIX in various places and it mostly relies on uname -m. Since Bash will remain a 32-bit executable for now, it's probably best if we set `MINGW_MOUNT_POINT="/arm64" here.

Before setting MINGW_MOUNT_POINT to /arm64:

image

After:

image

PATH="${MINGW_MOUNT_POINT}/bin:/mingw32/bin:${MSYS2_PATH}${ORIGINAL_PATH:+:${ORIGINAL_PATH}}"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need mingw32/bin in here anymore if we choose to go down the path from git-for-windows/MINGW-packages#44 and rename mingw32 to arm64 prior to copying the arm64 executables into it:

image

Curious to hear your thoughts on this

Copy link
Author

@tommyvct tommyvct Dec 28, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's @dscho 's idea.
#6 (comment)
I have no preference on this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would strongly recommend not renaming mingw32 to arm64, but instead adding the latter. Then, PATH can be configured in such a way that the binaries from arm64/bin/ are preferred over those from mingw32/bin/, and we're free to only provide a subset of the .exe files for ARM64 (with the rest just being used in their i686 form).

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense. Just applied that in git-for-windows/MINGW-packages#44; arm64 comes first in the path, then mingw32.

PKG_CONFIG_PATH="${MINGW_MOUNT_POINT}/lib/pkgconfig:${MINGW_MOUNT_POINT}/share/pkgconfig"
ACLOCAL_PATH="${MINGW_MOUNT_POINT}/share/aclocal:/usr/share/aclocal"
MANPATH="${MINGW_MOUNT_POINT}/local/man:${MINGW_MOUNT_POINT}/share/man:${MANPATH}"
;;
*)
PATH="${MSYS2_PATH}:/opt/bin${ORIGINAL_PATH:+:${ORIGINAL_PATH}}"
PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/share/pkgconfig:/lib/pkgconfig"
Expand Down