Skip to content

Commit

Permalink
update gcc@9 to gcc@13 on mac
Browse files Browse the repository at this point in the history
  • Loading branch information
argrath committed Dec 19, 2024
1 parent a52194a commit 5cab66d
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/unix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

- name: macos_prereq
if: runner.os == 'macOS'
run: brew install nkf gcc@9
run: brew install nkf gcc@13

- name: configure
run: ./configure
Expand Down
2 changes: 1 addition & 1 deletion japanese/build.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ make install

NetHackのビルド環境に加えて `GCC@9以上`, `nkf` が必要です。XCodeに含まれている`gcc`ではビルドできませんので、homebrewでインストールしてください。

設定ファイルはGCC@9を前提として書かれています。それ以外のバージョンの場合は`sys/unix/hints``japanese/set_mac.sh` の修正が必要です。
設定ファイルはGCC@13を前提として書かれています。それ以外のバージョンの場合は`sys/unix/hints``japanese/set_mac.sh` の修正が必要です。

```
./configure
Expand Down
2 changes: 1 addition & 1 deletion japanese/set_mac.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
brew link --overwrite gcc@9
brew link --overwrite gcc@13
find . -type f -name '*.c' -or -name '*.h'|xargs -n1 nkf -Sw --cp932 --overwrite
sh sys/unix/setup.sh sys/unix/hints/macosx10.10
2 changes: 1 addition & 1 deletion sys/unix/hints/macosx10.10
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ GAMEGRP = games
# build to run in the source tree - primarily for development. Build with "make all"
#WANT_SOURCE_INSTALL=1

CC=gcc-9
CC=gcc-13
CFLAGS+=-fexec-charset=cp932 -Wno-comment -Wno-unused-parameter -Wno-overlength-strings -Wno-format-overflow

# At the moment this is just for debugging, but in the future it could be
Expand Down

0 comments on commit 5cab66d

Please sign in to comment.