Try to fix rustflags env var definition

Signed-off-by: Timothy Johnson <[email protected]>
zowe · Nov 1, 2023 · 6f2d47c · 6f2d47c
1 parent 03ef98b
commit 6f2d47c
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/src/secrets/scripts/configure-cross.sh b/src/secrets/scripts/configure-cross.sh
@@ -2,30 +2,29 @@
 
 # Set environment variables needed for cross-compilation in current shell
 set_env() {
-    echo "CROSS_DEB_ARCH=$1" >> $GITHUB_ENV
-    echo "PKG_CONFIG_SYSROOT_DIR=\"${CHROOT:-/}\"" >> $GITHUB_ENV
-    # echo "RUSTFLAGS=\"-L $CHROOT$2 $RUSTFLAGS\"" >> $GITHUB_ENV
-    echo "PKG_CONFIG_PATH=\"$CHROOT$2/pkgconfig\"" >> $GITHUB_ENV
+    echo "PKG_CONFIG_SYSROOT_DIR=\"/\"" >> $GITHUB_ENV
+    echo "RUSTFLAGS=\"-L $1\"" >> $GITHUB_ENV
+    echo "PKG_CONFIG_PATH=\"$1/pkgconfig\"" >> $GITHUB_ENV
 }
 
 case "$1" in
     "aarch64")
-        set_env arm64 "/usr/lib/aarch64-linux-gnu"
+        set_env "/usr/lib/aarch64-linux-gnu"
         ;;
     "armv7")
-        set_env armhf "/usr/lib/arm-linux-gnueabihf"
+        set_env "/usr/lib/arm-linux-gnueabihf"
         ;;
     "ppc64le")
-        set_env ppc64el "/usr/lib/powerpc64le-unknown-linux-gnu"
+        set_env "/usr/lib/powerpc64le-unknown-linux-gnu"
         ;;
     "s390x")
-        set_env s390x "/usr/lib/s390x-unknown-linux-gnu"
+        set_env "/usr/lib/s390x-unknown-linux-gnu"
         ;;
     "x86")
-        set_env i686 "/usr/lib/i386-linux-gnu"
+        set_env "/usr/lib/i386-linux-gnu"
         ;;
     "x86_64")
-        set_env x86_64 "/usr/lib/x86_64-linux-gnu"
+        set_env "/usr/lib/x86_64-linux-gnu"
         ;;
     *)
         ;;