From 2df7e68102b2b19c89ea8cfc2cb8126c83eb26f7 Mon Sep 17 00:00:00 2001 From: Jeff Wendling Date: Thu, 5 Apr 2018 16:04:02 -0600 Subject: [PATCH] Revert "remove unsupported build flags on go1.9.4+" This reverts commit 6eae62b008b9be01fc006abeb0e581a98af677bb. This reverts commit baa1f6250e4db49619d7b3f6a3a76f1d16108631. Leaves in the removal of -w from the darwin LDFLAGS as it is still problematic on 1.9.5 and 1.10.1. --- build.go | 3 ++- build_static.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.go b/build.go index ffd870e..5fccc02 100644 --- a/build.go +++ b/build.go @@ -17,7 +17,8 @@ package openssl // #cgo linux windows pkg-config: libssl libcrypto -// #cgo darwin CFLAGS: -I/usr/local/opt/openssl@1.1/include -I/usr/local/opt/openssl/include +// #cgo linux CFLAGS: -Wno-deprecated-declarations +// #cgo darwin CFLAGS: -I/usr/local/opt/openssl@1.1/include -I/usr/local/opt/openssl/include -Wno-deprecated-declarations // #cgo darwin LDFLAGS: -L/usr/local/opt/openssl@1.1/lib -L/usr/local/opt/openssl/lib -lssl -lcrypto // #cgo windows CFLAGS: -DWIN32_LEAN_AND_MEAN import "C" diff --git a/build_static.go b/build_static.go index 8d95ad1..c84427b 100644 --- a/build_static.go +++ b/build_static.go @@ -17,7 +17,8 @@ package openssl // #cgo linux windows pkg-config: --static libssl libcrypto -// #cgo darwin CFLAGS: -I/usr/local/opt/openssl@1.1/include -I/usr/local/opt/openssl/include +// #cgo linux CFLAGS: -Wno-deprecated-declarations +// #cgo darwin CFLAGS: -I/usr/local/opt/openssl@1.1/include -I/usr/local/opt/openssl/include -Wno-deprecated-declarations // #cgo darwin LDFLAGS: -L/usr/local/opt/openssl@1.1/lib -L/usr/local/opt/openssl/lib -lssl -lcrypto // #cgo windows CFLAGS: -DWIN32_LEAN_AND_MEAN import "C"