From 7d98f94bdab36f8e362fb6975b318386096352ff Mon Sep 17 00:00:00 2001 From: smk762 Date: Fri, 8 Mar 2024 12:19:04 +0800 Subject: [PATCH] use gcc-9 --- .github/workflows/komodo_mac_ci.yml | 2 +- README.md | 2 +- depends/builders/darwin.mk | 8 ++++---- depends/hosts/darwin.mk | 4 ++-- src/cc/Makefile_custom | 2 +- src/cc/Makefile_rogue | 2 +- toolchain-info.sh | 2 +- zcutil/build-mac-dtest.sh | 4 ++-- zcutil/build-mac.sh | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/komodo_mac_ci.yml b/.github/workflows/komodo_mac_ci.yml index 493e536d2c0..ee1bf93707f 100644 --- a/.github/workflows/komodo_mac_ci.yml +++ b/.github/workflows/komodo_mac_ci.yml @@ -33,8 +33,8 @@ jobs: brew update brew upgrade || true brew tap discoteq/discoteq; brew install flock + brew install gcc@9 brew install autoconf autogen automake - brew install gcc@8 brew install binutils brew install protobuf brew install coreutils diff --git a/README.md b/README.md index 9568c70741a..c309f717035 100644 --- a/README.md +++ b/README.md @@ -93,8 +93,8 @@ xcode-select --install brew update brew upgrade brew tap discoteq/discoteq; brew install flock +brew update && brew install gcc@9 brew install autoconf autogen automake -brew update && brew install gcc@8 brew install binutils brew install protobuf brew install coreutils diff --git a/depends/builders/darwin.mk b/depends/builders/darwin.mk index cbbc5a667ab..d889a062716 100644 --- a/depends/builders/darwin.mk +++ b/depends/builders/darwin.mk @@ -1,5 +1,5 @@ -build_darwin_CC = gcc-8 -build_darwin_CXX = g++-8 +build_darwin_CC = gcc-9 +build_darwin_CXX = g++-9 build_darwin_AR: = $(shell xcrun -f ar) build_darwin_RANLIB: = $(shell xcrun -f ranlib) build_darwin_STRIP: = $(shell xcrun -f strip) @@ -10,8 +10,8 @@ build_darwin_SHA256SUM = shasum -a 256 build_darwin_DOWNLOAD = curl --connect-timeout $(DOWNLOAD_CONNECT_TIMEOUT) --retry $(DOWNLOAD_RETRIES) -L -f -o #darwin host on darwin builder. overrides darwin host preferences. -darwin_CC= gcc-8 -darwin_CXX= g++-8 +darwin_CC= gcc-9 +darwin_CXX= g++-9 darwin_AR:=$(shell xcrun -f ar) darwin_RANLIB:=$(shell xcrun -f ranlib) darwin_STRIP:=$(shell xcrun -f strip) diff --git a/depends/hosts/darwin.mk b/depends/hosts/darwin.mk index 43a4c88f2ab..b64a2d3fde5 100644 --- a/depends/hosts/darwin.mk +++ b/depends/hosts/darwin.mk @@ -2,8 +2,8 @@ OSX_MIN_VERSION=10.12 OSX_SDK_VERSION=10.12 OSX_SDK=$(SDK_PATH)/MacOSX$(OSX_SDK_VERSION).sdk LD64_VERSION=253.9 -darwin_CC=gcc-8 -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) -darwin_CXX=g++-8 -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) +darwin_CC=gcc-9 -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) +darwin_CXX=g++-9 -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) darwin_CFLAGS=-pipe darwin_CXXFLAGS=$(darwin_CFLAGS) diff --git a/src/cc/Makefile_custom b/src/cc/Makefile_custom index 364f9f4a121..935482373cf 100755 --- a/src/cc/Makefile_custom +++ b/src/cc/Makefile_custom @@ -1,6 +1,6 @@ SHELL = /bin/sh CC = gcc -CC_DARWIN = g++-8 +CC_DARWIN = g++-9 CC_WIN = x86_64-w64-mingw32-gcc-posix CFLAGS_DARWIN = -DBUILD_CUSTOMCC -std=c++11 -arch x86_64 -I../secp256k1/include -I../../depends/$(shell echo `../..//depends/config.guess`/include) -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -Wl,-undefined -Wl,dynamic_lookup -Wno-write-strings -shared -dynamiclib CFLAGS = -Wno-write-strings -DBUILD_CUSTOMCC -std=c++11 -I../secp256k1/include -I../../depends/$(shell echo `../..//depends/config.guess`/include) -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared diff --git a/src/cc/Makefile_rogue b/src/cc/Makefile_rogue index 3b2f65e00f6..bda6fa8ba39 100644 --- a/src/cc/Makefile_rogue +++ b/src/cc/Makefile_rogue @@ -1,6 +1,6 @@ SHELL = /bin/sh CC = gcc -CC_DARWIN = g++-8 +CC_DARWIN = g++-9 CC_WIN = x86_64-w64-mingw32-gcc-posix CFLAGS_DARWIN = -DBUILD_ROGUE -std=c++11 -arch x86_64 -I../../depends/$(shell echo `../..//depends/config.guess`/include) -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -Wl,-undefined -Wl,dynamic_lookup -Wno-write-strings -shared -dynamiclib CFLAGS = -Wno-write-strings -DBUILD_ROGUE -std=c++11 -I../../depends/$(shell echo `../..//depends/config.guess`/include) -I../univalue/include -I../cryptoconditions/include -I../cryptoconditions/src -I../cryptoconditions/src/asn -I.. -I. -fPIC -shared diff --git a/toolchain-info.sh b/toolchain-info.sh index 6a0fc7e75af..469662d74ac 100755 --- a/toolchain-info.sh +++ b/toolchain-info.sh @@ -1,6 +1,6 @@ #!/bin/bash -tools=("gcc-8" "g++-8" "otool" "nm") +tools=("gcc-9" "g++-8" "otool" "nm") echo "Platform: `uname -a`" echo "-------------------------------------" diff --git a/zcutil/build-mac-dtest.sh b/zcutil/build-mac-dtest.sh index c137cfa1b08..f25ce6f54ba 100755 --- a/zcutil/build-mac-dtest.sh +++ b/zcutil/build-mac-dtest.sh @@ -1,6 +1,6 @@ #!/bin/bash -export CC=gcc-8 -export CXX=g++-8 +export CC=gcc-9 +export CXX=g++-9 export LIBTOOL=libtool export AR=ar export RANLIB=ranlib diff --git a/zcutil/build-mac.sh b/zcutil/build-mac.sh index b01cb23cecc..cbfc5286d1e 100755 --- a/zcutil/build-mac.sh +++ b/zcutil/build-mac.sh @@ -1,6 +1,6 @@ #!/bin/bash -export CC=gcc-8 -export CXX=g++-8 +export CC=gcc-9 +export CXX=g++-9 export LIBTOOL=libtool export AR=ar export RANLIB=ranlib