run-tests, test-libcxx-module: Extend checks for MSYS to also check for CYGWIN
This commit is contained in:
1 parent
b8ef2ab96e
commit
e21ad3bba2
2 files changed
+2
-2
No files matched your search
+1
-1
@@ -129,7 +129,7 @@ set_native() {
|
|||||||
|
|
||||||
if [ -z "$RUN_X86_64" ] && [ -z "$RUN_I686" ] && [ -z "$RUN_ARMV7" ] && [ -z "$RUN_AARCH64" ]; then
|
if [ -z "$RUN_X86_64" ] && [ -z "$RUN_I686" ] && [ -z "$RUN_ARMV7" ] && [ -z "$RUN_AARCH64" ]; then
|
||||||
case $(uname) in
|
case $(uname) in
|
||||||
MINGW*|MSYS*)
|
MINGW*|MSYS*|CYGWIN*)
|
||||||
# On Windows/arm64, we may be running x86_64 msys2 emulated, so we
|
# On Windows/arm64, we may be running x86_64 msys2 emulated, so we
|
||||||
# can't rely on "uname -m" here. But the msys2 "uname" output indicates
|
# can't rely on "uname -m" here. But the msys2 "uname" output indicates
|
||||||
# the real host architecture, and the Windows build version.
|
# the real host architecture, and the Windows build version.
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ export PATH=$PREFIX/bin:$PATH
|
|||||||
: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64}}
|
: ${ARCHS:=${TOOLCHAIN_ARCHS-i686 x86_64 armv7 aarch64}}
|
||||||
|
|
||||||
case $(uname) in
|
case $(uname) in
|
||||||
MINGW*|MSYS*)
|
MINGW*|MSYS*|CYGWIN*)
|
||||||
NATIVE=1
|
NATIVE=1
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
|
|||||||
Reference in new issue
Block a user