From 673ceb6d672cb8a2fc4d9e7f577c47c321d33b32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org> Date: Mon, 3 Jun 2024 17:08:26 +0200 Subject: [PATCH] macOS package: bump to GCC 14 --- README.md | 2 +- macOS/homebrew-native-arm64.ini | 4 ++-- macOS/homebrew-native-x86_64.ini | 4 ++-- preprocessor | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index b9d059e308..dbad01839f 100644 --- a/README.md +++ b/README.md @@ -457,7 +457,7 @@ cd $DYNAREDIR/x13as curl -O https://www2.census.gov/software/x-13arima-seats/x13as/unix-linux/program-archives/x13as_asciisrc-v1-1-b60.tar.gz tar xf x13as_asciisrc-v1-1-b60.tar.gz sed -i '' 's/-static//g' makefile.gf -make -j$(sysctl -n hw.ncpu) -f makefile.gf FC=$BREWDIR/bin/gfortran LINKER=$BREWDIR/bin/gcc-13 FFLAGS="-O2 -std=legacy" LDFLAGS=-static-libgcc LIBS="$BREWDIR/lib/gcc/current/libgfortran.a /$BREWDIR/lib/gcc/current/libquadmath.a" PROGRAM=x13as +make -j$(sysctl -n hw.ncpu) -f makefile.gf FC=$BREWDIR/bin/gfortran LINKER=$BREWDIR/bin/gcc-14 FFLAGS="-O2 -std=legacy" LDFLAGS=-static-libgcc LIBS="$BREWDIR/lib/gcc/current/libgfortran.a /$BREWDIR/lib/gcc/current/libquadmath.a" PROGRAM=x13as sudo cp $DYNAREDIR/x13as/x13as /usr/local/bin/x13as cd $DYNAREDIR x13as diff --git a/macOS/homebrew-native-arm64.ini b/macOS/homebrew-native-arm64.ini index 39bdea1504..46d143b280 100644 --- a/macOS/homebrew-native-arm64.ini +++ b/macOS/homebrew-native-arm64.ini @@ -1,8 +1,8 @@ # Meson native file for compiling under Homebrew for arm64 architecture [binaries] -cpp = '/opt/homebrew/bin/g++-13' -c = '/opt/homebrew/bin/gcc-13' +cpp = '/opt/homebrew/bin/g++-14' +c = '/opt/homebrew/bin/gcc-14' flex = '/opt/homebrew/opt/flex/bin/flex' bison = '/opt/homebrew/opt/bison/bin/bison' diff --git a/macOS/homebrew-native-x86_64.ini b/macOS/homebrew-native-x86_64.ini index 42a189fe20..d08a4d694a 100644 --- a/macOS/homebrew-native-x86_64.ini +++ b/macOS/homebrew-native-x86_64.ini @@ -1,8 +1,8 @@ # Meson native file for compiling under Homebrew for x86_64 architecture [binaries] -cpp = '/usr/local/bin/g++-13' -c = '/usr/local/bin/gcc-13' +cpp = '/usr/local/bin/g++-14' +c = '/usr/local/bin/gcc-14' flex = '/usr/local/opt/flex/bin/flex' bison = '/usr/local/opt/bison/bin/bison' diff --git a/preprocessor b/preprocessor index 9eb2e73fb3..2b4f28c7a2 160000 --- a/preprocessor +++ b/preprocessor @@ -1 +1 @@ -Subproject commit 9eb2e73fb3fd383b6b2a81a0de1338f17c0a6c42 +Subproject commit 2b4f28c7a235fe8e05cd0ec4ecf5ca0d54a88ce6 -- GitLab