From 16ee3dad08dfcc179215cd807a69c15b830cd2a0 Mon Sep 17 00:00:00 2001 From: Jim Klimov Date: Wed, 29 Jan 2025 08:26:41 +0000 Subject: [PATCH] Revert "ci_build.sh: tolerate OpenSSL headers on OmniOS" This reverts commit c8927a525ff754467796635bdc3a866126377358: a more general fix posted to m4/nut_check_libopenssl.m4 --- ci_build.sh | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/ci_build.sh b/ci_build.sh index 571d09fbe..9b3f88802 100755 --- a/ci_build.sh +++ b/ci_build.sh @@ -923,16 +923,6 @@ detect_platform_PKG_CONFIG_PATH_and_FLAGS() { /opt/ooce/bin|*:/opt/ooce/bin|/opt/ooce/bin:*|*:/opt/ooce/bin:*) ;; *) if [ -d "/opt/ooce/bin" ] ; then PATH="/opt/ooce/bin:${PATH}" ; fi ;; esac - - if [ -d "/usr/ssl-3/include" ] ; then - # Lots of casting between method signatures with void/specific - # pointer types "converts to incompatible function type - # [-Werror,-Wcast-function-type-strict]" per clang's taste. - CFLAGS="${CFLAGS-} -isystem /usr/ssl-3/include" - #CPPFLAGS="${CPPFLAGS-} -isystem /usr/ssl-3/include" - CXXFLAGS="${CXXFLAGS-} -isystem /usr/ssl-3/include" - fi - ;; *darwin*|*macos*|*osx*) # Architecture-dependent base dir, e.g. -- 2.11.4.GIT