Add a "nopkcs11" build tag

This allows opting out of PKCS11 (to avoid needing libltdl), but with CGO still enabled so certstore is usable ~ CGO_ENABLED=1 go build -tags "nopkcs11 certstore" ~ otool -L ./ghostunnel ./ghostunnel: /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation (compatibility version 150.0.0, current version 1570.15.0) /System/Library/Frameworks/Security.framework/Versions/A/Security (compatibility version 1.0.0, current version 58286.251.4) /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1252.250.1)
openshift-bot · May 13, 2019 · 906c997 · 906c997
1 parent f2ffa57
commit 906c997
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -35,6 +35,7 @@ before_install:
 install:
   # Compile with CGO on/off for testing
   - CGO_ENABLED=0 go build -o ghostunnel-${TRAVIS_TAG}-linux-amd64-without-pkcs11 .
+  - CGO_ENABLED=1 go build -tags nopkcs11 -o ghostunnel-${TRAVIS_TAG}-linux-amd64-without-pkcs11-but-with-cgo .
   - CGO_ENABLED=1 go build -o ghostunnel-${TRAVIS_TAG}-linux-amd64-with-pkcs11 .
   # Build Docker container
   - make docker-build

diff --git a/certloader/pkcs11_disabled.go b/certloader/pkcs11_disabled.go
@@ -1,4 +1,4 @@
-// +build !cgo
+// +build !cgo nopkcs11
 
 /*-
  * Copyright 2018 Square Inc.

diff --git a/certloader/pkcs11_enabled.go b/certloader/pkcs11_enabled.go
@@ -1,4 +1,4 @@
-// +build cgo
+// +build cgo,!nopkcs11
 
 /*-
  * Copyright 2018 Square Inc.