'Generic Commit'

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

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}"