Native toolchain /usr

openframeworks · Feb 5, 2025 · 5641f68 · 5641f68
1 parent 27b85db
commit 5641f68
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/apothecary/configure/linuxaarch64_configure.sh b/apothecary/configure/linuxaarch64_configure.sh
@@ -9,6 +9,7 @@ CROSS_COMPILER="raspbian"
 CROSS_SYSROOT="rpi_rootfs"
 CROSS_ARCH="aarch64"
 CROSSCOMPILE=${CROSSCOMPILE:-1}
+SYSROOT_PATH="/usr/${CROSS_ARCH}-linux-gnu"
 export HOST_ARCH=$(uname -m)
 export HOST_PLATFORM=$(uname)
 
@@ -22,7 +23,7 @@ fi
 
 if [ "${CROSSCOMPILE}" -eq 0 ]; then
     export ROOTFS="/"
-    export TOOLCHAIN_ROOT="/${CROSS_COMPILER}"
+    export TOOLCHAIN_ROOT="/usr"
 else
     export ROOTFS="${APOTHECARY_LEVEL}/${CROSS_SYSROOT}"
     export TOOLCHAIN_ROOT="${APOTHECARY_LEVEL}/${CROSS_COMPILER}"

diff --git a/apothecary/configure/linuxarmv6l_configure.sh b/apothecary/configure/linuxarmv6l_configure.sh
@@ -25,7 +25,7 @@ fi
 
 if [ "${CROSSCOMPILE}" -eq 0 ]; then
     export ROOTFS="/"
-    export TOOLCHAIN_ROOT="/${CROSS_COMPILER}"
+    export TOOLCHAIN_ROOT="/usr"
 else
     export ROOTFS="${APOTHECARY_LEVEL}/${CROSS_SYSROOT}"
     export TOOLCHAIN_ROOT="${APOTHECARY_LEVEL}/${CROSS_COMPILER}"

diff --git a/apothecary/configure/linuxarmv7l_configure.sh b/apothecary/configure/linuxarmv7l_configure.sh
@@ -25,7 +25,7 @@ fi
 
 if [ "${CROSSCOMPILE}" -eq 0 ]; then
     export ROOTFS="/"
-    export TOOLCHAIN_ROOT="/${CROSS_COMPILER}"
+    export TOOLCHAIN_ROOT="/usr"
 else
     export ROOTFS="${APOTHECARY_LEVEL}/${CROSS_SYSROOT}"
     export TOOLCHAIN_ROOT="${APOTHECARY_LEVEL}/${CROSS_COMPILER}"

diff --git a/apothecary/configure/linuxarmv8_configure.sh b/apothecary/configure/linuxarmv8_configure.sh
@@ -25,7 +25,7 @@ fi
 
 if [ "${CROSSCOMPILE}" -eq 0 ]; then
     export ROOTFS="/"
-    export TOOLCHAIN_ROOT="/${CROSS_COMPILER}"
+    export TOOLCHAIN_ROOT="/usr"
 else
     export ROOTFS="${APOTHECARY_LEVEL}/${CROSS_SYSROOT}"
     export TOOLCHAIN_ROOT="${APOTHECARY_LEVEL}/${CROSS_COMPILER}"