Skip to content

Commit 883f763

Browse files
authored
ISSUE #331: Crashes on start - v2.1.3 - Ubuntu 24.04 (#343)
* Update dynamic lib linkage on Linux to be more portable * Update build pipeline for linux
1 parent 6a8ebce commit 883f763

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

.github/workflows/build.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
include:
1616
- os: windows-latest
1717
platform: win32-x64
18-
- os: ubuntu-22.04
18+
- os: ubuntu-24.04
1919
platform: linux-x64
20-
- os: ubuntu-22.04-arm
20+
- os: ubuntu-24.04-arm
2121
platform: linux-arm64
2222
- os: macos-latest
2323
platform: darwin-x64
@@ -28,6 +28,9 @@ jobs:
2828
with:
2929
submodules : recursive
3030
- uses: actboy168/setup-luamake@master
31+
- if: matrix.platform == 'linux-x64' || matrix.platform == 'linux-arm64'
32+
run: |
33+
sudo apt-get update && sudo apt-get install -y libiberty-dev
3134
- run: luamake lua compile/download_deps.lua
3235
- run: luamake -mode release -platform ${{ matrix.platform }}
3336
- run: npm install -g @vscode/vsce ovsx

compile/common/bee.lua

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ lm:source_set "source_bee" {
6969
},
7070
linux = {
7171
sources = {
72-
"!bee/crash/linux/**/",
7372
need {
7473
"linux",
7574
"posix",
@@ -136,9 +135,11 @@ lm:source_set "source_bee" {
136135
}
137136
},
138137
linux = {
139-
ldflags = "-pthread",
138+
ldflags = "-pthread -l:libbfd.a -l:libiberty.a -l:libsframe.a -l:libzstd.so -l:libz.so",
140139
links = {
141140
"stdc++fs",
141+
"unwind",
142+
"gcc_s"
142143
}
143144
},
144145
macos = {

0 commit comments

Comments
 (0)