diff --git a/README.md b/README.md index b9d059e308689645d98cb7a439d34a5b7a295ae0..dbad01839f05e41b1656da914936edc2e5924d89 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 39bdea15045d2b6a5c70bc32521c386e1ee6510a..46d143b280165d008d0eec72755c7118c84d4aa4 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 42a189fe2035fbb2ddb56818d17554a627831211..d08a4d694ac07c19a855e7b90677b11d4dfa8bf4 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 9eb2e73fb3fd383b6b2a81a0de1338f17c0a6c42..2b4f28c7a235fe8e05cd0ec4ecf5ca0d54a88ce6 160000 --- a/preprocessor +++ b/preprocessor @@ -1 +1 @@ -Subproject commit 9eb2e73fb3fd383b6b2a81a0de1338f17c0a6c42 +Subproject commit 2b4f28c7a235fe8e05cd0ec4ecf5ca0d54a88ce6