Merge a213bd63ca into merged_master (Bitcoin PR bitcoin/bitcoin#23817)

This commit is contained in:
Byron Hambly 2023-06-14 08:02:36 +00:00
commit df5a1245c8

View file

@ -22,7 +22,7 @@ darwin_INSTALL_NAME_TOOL:=$(shell xcrun -f install_name_tool)
darwin_native_binutils=
darwin_native_toolchain=
x86_64_darwin_CFLAGS = -arch x86_64
x86_64_darwin_CXXFLAGS = $(x86_64_darwin_CFLAGS)
aarch64_darwin_CFLAGS = -arch arm64
aarch64_darwin_CXXFLAGS = $(aarch64_darwin_CFLAGS)
x86_64_darwin_CFLAGS += -arch x86_64
x86_64_darwin_CXXFLAGS += -arch x86_64
aarch64_darwin_CFLAGS += -arch arm64
aarch64_darwin_CXXFLAGS += -arch arm64