From 2d19174f8ef5c0987cca9ccbc70b3a3c66731cb2 Mon Sep 17 00:00:00 2001
From: Noah Treuhaft <noah.treuhaft@gmail.com>
Date: Tue, 10 Nov 2020 12:47:01 -0800
Subject: [PATCH] Link plugins statically (#47)

---
 .github/workflows/brim.yml | 4 +++-
 brim/release               | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/brim.yml b/.github/workflows/brim.yml
index 91509d708b5..cea2c8612bf 100644
--- a/.github/workflows/brim.yml
+++ b/.github/workflows/brim.yml
@@ -51,10 +51,12 @@ jobs:
 
       - uses: actions/cache@v2
         with:
-          path: ~/.ccache
+          path: ${{runner.temp}}/.ccache
           key: ${{ runner.os }}-ccache
 
       - run: ./brim/release
+        env:
+          CCACHE_DIR: ${{runner.temp}}/.ccache
 
       - uses: actions/upload-artifact@v2
         with:
diff --git a/brim/release b/brim/release
index ce0edf3190c..3d8564b3b84 100755
--- a/brim/release
+++ b/brim/release
@@ -117,6 +117,9 @@ install_zeek_package() {
 
         build_command=$(zkg_meta package build_command)
         if [ "$build_command" ]; then
+            if [ "$OS" = Windows_NT ]; then
+                export LDFLAGS='-static -Wl,--allow-multiple-definition'
+            fi
             sh -c "$build_command"
             $sudo tar -xf build/*.tgz -C /usr/local/zeek/lib/zeek/plugins
         fi
@@ -125,7 +128,7 @@ install_zeek_package() {
         if [ "$test_command" ]; then
             # Btest fails without explanation on the GitHub Actions
             # Windows runners, so skip tests there.
-            if [ "$GITHUB_ACTIONS" != true -o "$OS" != Windows_NT || ]; then
+            if [ "$GITHUB_ACTIONS" != true -o "$OS" != Windows_NT ]; then
                sh -c "$test_command"
             fi
         fi