Skip to content

Commit 2ecdac7

Browse files
committed
Change linux-build defaults for macOS
1 parent 328ea8f commit 2ecdac7

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

.github/workflows/build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
run: brew link --overwrite mysql
7171

7272
- name: Run Build
73-
run: ./linux-build.sh --os=macosx
73+
run: ./linux-build.sh
7474

7575
linux:
7676
strategy:

linux-build.sh

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
#!/bin/bash -e
22

33
# Set variable defaults
4-
: ${BUILD_OS:=linux}
5-
: ${BUILD_ARCHITECTURE:=x64}
64
: ${BUILD_CONFIG:=release}
75
: ${PREMAKE_FILE:=premake5.lua}
8-
: ${GCC_PREFIX:=}
9-
: ${AR:=ar}
10-
: ${CC:=gcc}
11-
: ${CXX:=g++}
126

13-
# Find premake binary location
147
if [ "$(uname)" == "Darwin" ]; then
15-
PREMAKE5=utils/premake5-macos
8+
cores=$(sysctl -n hw.ncpu)
9+
: ${NUM_CORES:=$cores}
10+
: ${PREMAKE5:=utils/premake5-macos}
11+
: ${BUILD_OS:=macosx}
12+
: ${BUILD_ARCHITECTURE:=arm64}
13+
: ${AR:=ar}
14+
: ${CC:=clang}
15+
: ${CXX:=clang++}
1616
else
17-
PREMAKE5=utils/premake5
18-
fi
19-
20-
# Number of cores
21-
if [ "$(uname)" == "Darwin" ]; then
22-
NUM_CORES=$(sysctl -n hw.ncpu)
23-
else
24-
NUM_CORES=$(grep -c ^processor /proc/cpuinfo)
17+
cores=$(grep -c ^processor /proc/cpuinfo)
18+
: ${NUM_CORES:=$cores}
19+
: ${PREMAKE5:=utils/premake5}
20+
: ${BUILD_OS:=linux}
21+
: ${BUILD_ARCHITECTURE:=x64}
22+
: ${AR:=ar}
23+
: ${CC:=gcc}
24+
: ${CXX:=g++}
2525
fi
2626

2727
# Read script arguments

0 commit comments

Comments
 (0)