Synchronize changes from 1.6 master branch [ci skip]

2a3e298 Fix defaults for macOS in linux-build.sh
cab4665 Remove old code in Docker image workflow

Author: github-actions[bot]

.github/workflows/dockerimage.yaml

@@ -8,21 +8,10 @@ on:
     paths: 
     - '.github/workflows/build.yaml'
     - '.github/workflows/dockerimage.yaml'
-    - '/utils/docker/**'
+    - 'utils/docker/**'
 
 jobs:
   build:
-    strategy:
-      matrix:
-        include:
-        - tag: latest
-          dockerfile: Dockerfile
-        - tag: i386
-          dockerfile: Dockerfile.i386
-        - tag: armhf
-          dockerfile: Dockerfile.armhf
-        - tag: arm64
-          dockerfile: Dockerfile.arm64
     if: github.event.repository.fork == false
     runs-on: ubuntu-latest
     steps:

linux-build.sh

@@ -16,6 +16,10 @@ fi
 # Number of cores
 if [ "$(uname)" == "Darwin" ]; then
     NUM_CORES=$(sysctl -n hw.ncpu)
+    : ${GCC_PREFIX:=}
+    : ${AR:=ar}
+    : ${CC:=gcc}
+    : ${CXX:=g++}
 else
     NUM_CORES=$(grep -c ^processor /proc/cpuinfo)
 fi