Use build-std.

Author: rkistner

.cargo/config.toml

@@ -1,24 +1,35 @@
-# On Linux, if we don't link to gcc_eh, we get can get this error when loading the loadable extension:
-# undefined symbol: _Unwind_Resume
-# This adds around 29KB to the loadable extension.
-# It may also be an option to just define _Unwind_Resume, but it causes crashes on errors on e.g. iOS, so rather avoid it.
 
-[target.x86_64-unknown-linux-gnu]
-rustflags = [
-    "-C", "link-arg=-lgcc_eh",
-]
+# Previously we added this to rustflags for all linux builds:
+#   "-C", "link-arg=-lgcc_eh"
+# It was to fix this error when loading the loadable extension:
+#   undefined symbol: _Unwind_Resume
+# Now, we instead build using:
+#   -Z build-std=panic_abort,core,alloc
+# This fixes the same issue. We still keep -lgcc_eh,
+# to support manual builds without -Z build-std.
+
+# Without -Z build-std, with -lgcc_eh:
+#   241KB, loading works
+# Without -Z build-std, without -lgcc_eh:
+#   207KB, undefined symbol: _Unwind_Resume
+# With -Z build-std, without -lgcc_eh:
+#   173K, loading works
+# With -Z build-std, with -lgcc_eh:
+#   173K, loading works
+# Conclusion: -lgcc_eh has no effect when using -Z build-std.
 
-[target.i686-linux-unknown-linux-gnu]
+[target.x86_64-unknown-linux-gnu]
 rustflags = [
     "-C", "link-arg=-lgcc_eh",
 ]
 
-[target.aarch64-linux-unknown-linux-gnu]
+[target.i686-unknown-linux-gnu]
 rustflags = [
     "-C", "link-arg=-lgcc_eh",
 ]
 
 [target.aarch64-unknown-linux-gnu]
+linker = "aarch64-linux-gnu-gcc"
 rustflags = [
     "-C", "link-arg=-lgcc_eh",
 ]

.github/workflows/linux.yml

@@ -18,7 +18,7 @@ jobs:
           components: rust-src
 
       - name: Build binaries
-        run: bash tool/build_linux.sh x64
+        run: ./tool/build_linux.sh x64
 
       - name: Upload binary
         if: github.event_name == 'workflow_dispatch'
@@ -43,7 +43,7 @@ jobs:
           components: rust-src
 
       - name: Build binaries
-        run: bash tool/build_linux.sh aarch64
+        run: ./tool/build_linux.sh aarch64
 
       - name: Upload binary
         if: github.event_name == 'workflow_dispatch'

.github/workflows/tests.yml

@@ -20,12 +20,12 @@ jobs:
       - name: Ubuntu setup
         if: matrix.os == 'ubuntu-24.04'
         run: |
-          sudo apt install libreadline-dev
+          sudo apt install libreadline-dev gcc-aarch64-linux-gnu
 
       - name: Build
         run: |
           # Need a debug build for the dart tests
-          cargo build -p powersync_loadable
+          cargo build -p powersync_loadable -Z build-std=panic_abort,core,alloc --release --target x86_64-unknown-linux-gnu
 
           cargo build -p powersync_loadable --release
           cargo build -p powersync_core --release --features static

tool/build_linux.sh

@@ -1,9 +1,10 @@
+#!/bin/sh
+set -e
+
 if [ "$1" = "x64" ]; then
-  rustup target add target x86_64-unknown-linux-gnu
-  cargo build -p powersync_loadable --release
-  mv "target/release/libpowersync.so" "libpowersync_x64.so"
+  cargo build -p powersync_loadable -Z build-std=panic_abort,core,alloc --release --target x86_64-unknown-linux-gnu
+  mv "target/x86_64-unknown-linux-gnu/release/libpowersync.so" "libpowersync_x64.so"
 else
-  rustup target add aarch64-unknown-linux-gnu
-  cargo build -p powersync_loadable --release
-  mv "target/release/libpowersync.so" "libpowersync_aarch64.so"
+  cargo build -p powersync_loadable -Z build-std=panic_abort,core,alloc --release --target aarch64-unknown-linux-gnu
+  mv "target/aarch64-unknown-linux-gnu/release/libpowersync.so" "libpowersync_aarch64.so"
 fi

tool/build_macos.sh

@@ -1,10 +1,10 @@
+#!/bin/sh
+set -e
+
 if [ "$1" = "x64" ]; then
-  #Note: x86_64-apple-darwin has not been tested.
-  rustup target add target x86_64-apple-darwin
-  cargo build -p powersync_loadable --release
-  mv "target/release/libpowersync.dylib" "libpowersync_x64.dylib"
+  cargo build -Z build-std=panic_abort,core,alloc -p powersync_loadable --release --target x86_64-apple-darwin
+  mv "target/x86_64-apple-darwin/release/libpowersync.dylib" "libpowersync_x64.dylib"
 else
-  rustup target add aarch64-apple-darwin
-  cargo build -p powersync_loadable --release
-  mv "target/release/libpowersync.dylib" "libpowersync_aarch64.dylib"
+  cargo build -Z build-std=panic_abort,core,alloc -p powersync_loadable --release --target aarch64-apple-darwin
+  mv "target/aarch64-apple-darwin/release/libpowersync.dylib" "libpowersync_aarch64.dylib"
 fi

tool/build_windows.sh

@@ -1,10 +1,11 @@
+#!/bin/sh
+set -e
+
 if [ "$1" = "x64" ]; then
-  rustup target add x86_64-pc-windows-msvc
-  cargo build -p powersync_loadable --release
-  mv "target/release/powersync.dll" "powersync_x64.dll"
+  cargo build -Z build-std=panic_abort,core,alloc -p powersync_loadable --release --target x86_64-pc-windows-msvc
+  mv "target/x86_64-pc-windows-msvc/release/powersync.dll" "powersync_x64.dll"
 else
   #Note: aarch64-pc-windows-msvc has not been tested.
-  rustup target add aarch64-pc-windows-msvc
-  cargo build -p powersync_loadable --release
-  mv "target/release/powersync.dll" "powersync_aarch64.dll"
+  cargo build -Z build-std=panic_abort,core,alloc -p powersync_loadable --release --target aarch64-pc-windows-msvc
+  mv "target/aarch64-pc-windows-msvc/release/powersync.dll" "powersync_aarch64.dll"
 fi