From: SHIRAKATA Kentaro <argrath@ub32.org>
Date: Fri, 3 Apr 2020 21:11:14 +0000 (+0900)
Subject: update build env for mac
X-Git-Tag: v3.6.6-0.1~16
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;ds=sidebyside;h=985ea24e39c794c2b8d12c779c1118e2d3fec1f5;p=jnethack%2Fsource.git

update build env for mac
---

diff --git a/.travis.yml b/.travis.yml
index 4729f39..1b30fe1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ os:
 compiler:
   - gcc
 
-osx_image: xcode10.2
+osx_image: xcode11.3
 
 addons:
   apt:
@@ -16,7 +16,7 @@ addons:
   homebrew:
     packages:
     - nkf
-    - gcc@8
+    - gcc@9
 
 before_script:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sh japanese/set_mac.sh ; fi
diff --git a/japanese/set_mac.sh b/japanese/set_mac.sh
index 435b908..ea83750 100644
--- a/japanese/set_mac.sh
+++ b/japanese/set_mac.sh
@@ -1,3 +1,3 @@
-brew link --overwrite gcc@8
+brew link --overwrite gcc@9
 find . -type f -name '*.c' -or -name '*.h'|xargs -n1 nkf -Sw --cp932 --overwrite
 sh sys/unix/setup.sh sys/unix/hints/macosx10.10
diff --git a/sys/unix/hints/macosx10.10 b/sys/unix/hints/macosx10.10
index a09d3f4..c54c754 100644
--- a/sys/unix/hints/macosx10.10
+++ b/sys/unix/hints/macosx10.10
@@ -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-8
+CC=gcc-9
 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