From babfeae4567b642756a3fceeac31400f3e7f65e8 Mon Sep 17 00:00:00 2001
From: Your Name <j@842.be>
Date: Mon, 2 Jun 2025 23:03:23 +1200
Subject: [PATCH] 'Generic Commit'

---
 ipdemo/CMakeLists.txt | 2 +-
 src/dropshell-build   | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ipdemo/CMakeLists.txt b/ipdemo/CMakeLists.txt
index 6f4b757..4dc6da5 100644
--- a/ipdemo/CMakeLists.txt
+++ b/ipdemo/CMakeLists.txt
@@ -92,9 +92,9 @@ FetchContent_MakeAvailable(nlohmann_json)
 # Link libraries
 target_link_libraries(${PROJECT_EXE_NAME} PRIVATE
     libassert::assert
+    "${CMAKE_SYSROOT}/usr/lib/libunwind.a"
     cpptrace::cpptrace
     nlohmann_json::nlohmann_json
-    ${CMAKE_SYSROOT}/usr/lib/libunwind.a
 )
 
 # Set static linking flags
diff --git a/src/dropshell-build b/src/dropshell-build
index 2038c37..8b79c44 100755
--- a/src/dropshell-build
+++ b/src/dropshell-build
@@ -179,7 +179,10 @@ function build_arch() {
         -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
         -DCMAKE_FIND_ROOT_PATH="${ARCH_SYSROOT}" \
         -DCMAKE_SYSROOT="${ARCH_SYSROOT}" \
-        -DCMAKE_PREFIX_PATH="${ARCH_SYSROOT}/usr"
+        -DCMAKE_PREFIX_PATH="${ARCH_SYSROOT}/usr" \
+        -DCMAKE_LIBRARY_PATH="${ARCH_SYSROOT}/usr/lib" \
+        -DCMAKE_LIBRARY_PATH="${ARCH_SYSROOT}/usr/lib64" 
+
     cd "${ARCH_BUILD_DIR}" || exit 1
     ninja -k0 -j"${JOBS}"