Merge pull request #3018 from MarcelBochtler/mac-arm64

Fix relaunching scancode on Apple silicon using Rosetta 2 emulation #2835

Author: pombredanne

configure

@@ -119,8 +119,8 @@ CFG_ROOT_DIR="$( cd "$( dirname "${CFG_BIN}" )" && pwd )"
 CFG_BIN_DIR=$CFG_ROOT_DIR/$VIRTUALENV_DIR/bin
 
 # force relaunching under X86-64 architecture on macOS M1/ARM 
-if [[ $OSTYPE == 'darwin'* && $(uname -m) == 'arm64' ]]; then
-    arch -x86_64 /bin/bash -c "$CFG_ROOT_DIR/configure $@"
+if [[ $OSTYPE == 'darwin'* && $(uname -m) == 'arm64' && $(sysctl -in sysctl.proc_translated) == 0 ]]; then
+    arch -x86_64 /bin/bash -c "$CFG_ROOT_DIR/configure $*"
     exit $?
 fi
 

extractcode

@@ -121,8 +121,8 @@ SCANCODE_BIN="$( realpath "${BASH_SOURCE[0]}" )"
 SCANCODE_ROOT_DIR="$( cd "$( dirname "${SCANCODE_BIN}" )" && pwd )"
 
 # force relaunching under X86-64 architecture on macOS M1/ARM 
-if [[ $OSTYPE == 'darwin'* && $(uname -m) == 'arm64' ]]; then
-    arch -x86_64 /bin/bash -c "$SCANCODE_ROOT_DIR/$COMMAND_TO_RUN $@"
+if [[ $OSTYPE == 'darwin'* && $(uname -m) == 'arm64' && $(sysctl -in sysctl.proc_translated) == 0 ]]; then
+    arch -x86_64 /bin/bash -c "$SCANCODE_ROOT_DIR/$COMMAND_TO_RUN $*"
     exit $?
 fi
 

scancode

@@ -121,8 +121,8 @@ SCANCODE_BIN="$( realpath "${BASH_SOURCE[0]}" )"
 SCANCODE_ROOT_DIR="$( cd "$( dirname "${SCANCODE_BIN}" )" && pwd )"
 
 # force relaunching under X86-64 architecture on macOS M1/ARM 
-if [[ $OSTYPE == 'darwin'* && $(uname -m) == 'arm64' ]]; then
-    arch -x86_64 /bin/bash -c "$SCANCODE_ROOT_DIR/$COMMAND_TO_RUN $@"
+if [[ $OSTYPE == 'darwin'* && $(uname -m) == 'arm64' && $(sysctl -in sysctl.proc_translated) == 0 ]]; then
+    arch -x86_64 /bin/bash -c "$SCANCODE_ROOT_DIR/$COMMAND_TO_RUN $*"
     exit $?
 fi