Merge pull request #3274 from hadfl/aarch64

pkg-config and cmake should be sysroot aware for cross-builds
omniosorg · Jul 3, 2023 · d9108fd · d9108fd
2 parents 7993065 + 207dbfb
commit d9108fd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/build/glib/build.sh b/build/glib/build.sh
@@ -118,8 +118,6 @@ pre_configure() {
 
     CONFIGURE_CMD+=" --cross-file $SRCDIR/files/aarch64-gcc.txt"
 
-    export PKG_CONFIG_SYSROOT_DIR=${SYSROOT[$arch]}
-
     # use GNU msgfmt; otherwise the build fails
     PATH="$GNUBIN:$PATH:$OOCEBIN"
 }

diff --git a/lib/functions.sh b/lib/functions.sh
@@ -462,6 +462,15 @@ set_crossgcc() {
         || CFLAGS[$arch]+=" --sysroot=${SYSROOT[$arch]}"
     [[ ${CXXFLAGS[$arch]} =~ *--sysroot* ]] \
         || CXXFLAGS[$arch]+=" --sysroot=${SYSROOT[$arch]}"
+
+    export PKG_CONFIG_SYSROOT_DIR=${SYSROOT[$arch]}
+
+    [[ $CONFIGURE_CMD =~ $CMAKE* ]] && CONFIGURE_OPTS[$arch]+="
+        -DCMAKE_FIND_ROOT_PATH=${SYSROOT[$arch]}
+        -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER
+        -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=ONLY
+        -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY
+    "
 }
 
 set_clangver() {