From d969766e67e6d5220b42ce4897cac5a5f6f4f301 Mon Sep 17 00:00:00 2001 From: "Michael Bradley, Jr" Date: Fri, 24 Sep 2021 11:12:47 -0500 Subject: [PATCH] fix: on macOS download openssl@1.1 bottle because openssl bottle is now alias for openssl@3 --- Makefile | 2 +- config.nims | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a954ea2989..09f438fd2d 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,7 @@ endif ifeq ($(detected_OS),Darwin) BOTTLES_DIR := $(shell pwd)/bottles -BOTTLES := $(addprefix $(BOTTLES_DIR)/,hunspell openssl pcre) +BOTTLES := $(addprefix $(BOTTLES_DIR)/,hunspell openssl@1.1 pcre) $(BOTTLES): | $(BOTTLES_DIR) echo -e "\e[92mFetching:\e[39m $(notdir $@) bottle" diff --git a/config.nims b/config.nims index 6e3de05b7b..e7086cb176 100644 --- a/config.nims +++ b/config.nims @@ -17,8 +17,8 @@ if defined(macosx): switch("passL", "-rpath" & " " & getEnv("QT5_LIBDIR")) switch("passL", "-rpath" & " " & getEnv("STATUSGO_LIBDIR")) # statically link these libs - switch("passL", "bottles/openssl/lib/libcrypto.a") - switch("passL", "bottles/openssl/lib/libssl.a") + switch("passL", "bottles/openssl@1.1/lib/libcrypto.a") + switch("passL", "bottles/openssl@1.1/lib/libssl.a") switch("passL", "bottles/pcre/lib/libpcre.a") # https://code.videolan.org/videolan/VLCKit/-/issues/232 switch("passL", "-Wl,-no_compact_unwind") @@ -44,4 +44,3 @@ switch("warning", "ObservableStores:off") # Too many false positives for "Warning: method has lock level , but another method has 0 [LockLevel]" switch("warning", "LockLevel:off") -