Skip to content
This repository has been archived by the owner on Apr 1, 2024. It is now read-only.

Commit

Permalink
Link plugins statically (#47)
Browse files Browse the repository at this point in the history
  • Loading branch information
nwt authored Nov 10, 2020
1 parent 8944c4e commit 2d19174
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/brim.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
5 changes: 4 additions & 1 deletion brim/release
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 2d19174

Please sign in to comment.