Skip to content

Commit 89d08cc

Browse files
committed
Ensure we install GCC 12, which we edit the Makefile to use
1 parent 11993dc commit 89d08cc

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export LDFLAGS := -L/usr/local/opt/qt@5/lib -Wl,-no_fixup_chains
1313
export CPPFLAGS := -I/usr/local/opt/qt@5/include
1414
export PKG_CONFIG_PATH := /usr/local/opt/qt@5/lib/pkgconfig
1515

16-
all: frontend pob
16+
all: frontend pob
1717
pushd build; \
1818
ninja install; \
1919
popd; \
@@ -32,7 +32,7 @@ sign:
3232
# the binary, but within their user directory
3333

3434
# Relevant code is:
35-
#
35+
#
3636
# ```lua
3737
# if launch.devMode or (GetScriptPath() == GetRuntimePath() and not launch.installedMode) then
3838
# -- If running in dev mode or standalone mode, put user data in the script path
@@ -45,7 +45,7 @@ pob: load_pob luacurl frontend
4545
bash ../editPathOfBuildingBuild.sh; \
4646
popd
4747

48-
frontend:
48+
frontend:
4949
arch=x86_64 meson -Dbuildtype=release --prefix=${DIR}/PathOfBuilding.app --bindir=Contents/MacOS build
5050

5151
load_pob:
@@ -65,7 +65,7 @@ luacurl:
6565
# curl is used since mesonInstaller.sh copies over the shared library dylib
6666
# dylibbundler is used to copy over dylibs that lcurl.so uses
6767
tools:
68-
arch --x86_64 brew install qt@5 luajit zlib meson curl dylibbundler gcc
68+
arch --x86_64 brew install qt@5 luajit zlib meson curl dylibbundler gcc@12
6969

7070
# We don't usually modify the PathOfBuilding directory, so there's rarely a
7171
# need to delete it. We separate it out to a separate task.

0 commit comments

Comments
 (0)