GO-3980 Fix SIGSEGV in musl version

anyproto · Sep 24, 2024 · cb7be88 · cb7be88
1 parent aa8e992
commit cb7be88
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
@@ -1,18 +1,18 @@
 [package]
 name = "tantivy-go"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 build = "src/build.rs"
 
 [lib]
 crate-type = ["staticlib"]
 
 [build-dependencies]
-cbindgen = "0.26.0"
+cbindgen = "0.27.0"
 
 [dependencies]
 tantivy = "0.22.0"
-cbindgen = "0.26.0"
+cbindgen = "0.27.0"
 log = "0.4.21"
 base64 = "0.22.1"
 env_logger = "0.11.3"

diff --git a/rust/Makefile b/rust/Makefile
@@ -14,8 +14,9 @@ setup:
 	@rustup target add x86_64-apple-darwin
 	@rustup target add x86_64-pc-windows-gnu
 
+# strange SIGSEGV at higher levels of optimization
 build-linux-amd64-musl:
-	env TARGET_CC=x86_64-linux-musl-gcc cargo build --release --target x86_64-unknown-linux-musl
+	env TARGET_CC=x86_64-linux-musl-gcc RUSTFLAGS='-C opt-level=1' cargo build --release --target x86_64-unknown-linux-musl
 
 install-linux-amd64-musl: build-linux-amd64-musl
 	@mkdir -p ../libs/linux-amd64-musl

diff --git a/typedef_unix32.go b/typedef_unix32.go
@@ -5,4 +5,3 @@ package tantivy_go
 import "C"
 
 type pointerCType = C.uint
-type pointerGoType = uint64
diff --git a/typedef_unix64.go b/typedef_unix64.go
@@ -5,4 +5,3 @@ package tantivy_go
 import "C"
 
 type pointerCType = C.ulong
-type pointerGoType = uint64
diff --git a/typedef_win64.go b/typedef_win64.go
@@ -5,4 +5,3 @@ package tantivy_go
 import "C"
 
 type pointerCType = C.ulonglong
-type pointerGoType = uint64