Update test-linux.yml

Author: kazuki0824

.github/workflows/test-linux.yml

@@ -59,63 +59,35 @@ jobs:
         run: |
           export DEBIAN_FRONTEND=noninteractive
           TARGET_ID="${{ matrix.target_arch }}"
-          # Convert target triple to uppercase with underscores for Rust env var conventions
-          # e.g., aarch64-unknown-linux-gnu -> AARCH64_UNKNOWN_LINUX_GNU
-          RUST_TARGET_ENV_PREFIX=$(echo $TARGET_ID | tr 'a-z-' 'A-Z_')
-
           echo "Setting up for target: $TARGET_ID"
-          # This hint helps the pkg-config crate in Rust.
-          echo "PKG_CONFIG_ALLOW_CROSS=1" >> $GITHUB_ENV
 
           if [ "$TARGET_ID" == "x86_64-unknown-linux-gnu" ]; then
-            # Native compilation: install standard dev packages
             echo "Installing native libraries: libpcsclite-dev libdvbv5-dev libudev-dev"
             sudo apt-get install -y -qq libpcsclite-dev libdvbv5-dev libudev-dev
           else
-            # Cross-compilation: install :arch packages and set pkg-config env vars for the target
             ARCH_SUFFIX=""
-            PKG_CONFIG_CROSS_EXECUTABLE=""
             PKG_CONFIG_CROSS_LIB_DIR=""
-
             if [ "$TARGET_ID" == "aarch64-unknown-linux-gnu" ]; then
               ARCH_SUFFIX="arm64"
-              # The gcc-aarch64-linux-gnu package (from linker_package) should provide aarch64-linux-gnu-pkg-config
-              if command -v aarch64-linux-gnu-pkg-config &> /dev/null; then
-                PKG_CONFIG_CROSS_EXECUTABLE=$(command -v aarch64-linux-gnu-pkg-config)
-              fi
-              PKG_CONFIG_CROSS_LIB_DIR="/usr/lib/aarch64-linux-gnu/pkgconfig" # Standard path for arm64 .pc files
-              echo "CARGO_TARGET_${RUST_TARGET_ENV_PREFIX}_LINKER=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
-
+              PKG_CONFIG_CROSS_LIB_DIR="/usr/lib/aarch64-linux-gnu/pkgconfig"
             elif [ "$TARGET_ID" == "i686-unknown-linux-gnu" ]; then
               ARCH_SUFFIX="i386"
-              PKG_CONFIG_CROSS_LIB_DIR="/usr/lib/i386-linux-gnu/pkgconfig" # Standard path for i386 .pc files
-              # For i386 with gcc-multilib, CFLAGS/LDFLAGS can help ensure 32-bit linkage for C parts
-              echo "CFLAGS=-m32" >> $GITHUB_ENV
-              echo "CXXFLAGS=-m32" >> $GITHUB_ENV
-              echo "LDFLAGS=-m32" >> $GITHUB_ENV # Less common for LDFLAGS, but can be useful
-              echo "CARGO_TARGET_${RUST_TARGET_ENV_PREFIX}_LINKER=gcc" >> $GITHUB_ENV # Rustc will instruct gcc to build for 32-bit
-            fi
-
-            # Set environment variables for the pkg-config crate
-            if [ ! -z "$PKG_CONFIG_CROSS_EXECUTABLE" ]; then
-              echo "Using target-specific pkg-config: $PKG_CONFIG_CROSS_EXECUTABLE"
-              echo "PKG_CONFIG_$RUST_TARGET_ENV_PREFIX=$PKG_CONFIG_CROSS_EXECUTABLE" >> $GITHUB_ENV
-            elif [ ! -z "$PKG_CONFIG_CROSS_LIB_DIR" ]; then
-              echo "Setting pkg-config library directory for target: $PKG_CONFIG_CROSS_LIB_DIR"
-              echo "PKG_CONFIG_LIBDIR_$RUST_TARGET_ENV_PREFIX=$PKG_CONFIG_CROSS_LIB_DIR" >> $GITHUB_ENV
-              # Also set PKG_CONFIG_PATH_<TARGET> as some build scripts might prefer that
-              echo "PKG_CONFIG_PATH_$RUST_TARGET_ENV_PREFIX=$PKG_CONFIG_CROSS_LIB_DIR" >> $GITHUB_ENV
+              PKG_CONFIG_CROSS_LIB_DIR="/usr/lib/i386-linux-gnu/pkgconfig"
             fi
 
             echo "Adding architecture $ARCH_SUFFIX for apt."
             sudo dpkg --add-architecture $ARCH_SUFFIX
-            echo "Updating apt package list after adding architecture."
             sudo apt-get update -y -qq
             echo "Installing libraries for $ARCH_SUFFIX: libpcsclite-dev:$ARCH_SUFFIX libdvbv5-dev:$ARCH_SUFFIX libudev-dev:$ARCH_SUFFIX"
             sudo apt-get install -y -qq \
               libpcsclite-dev:$ARCH_SUFFIX \
               libdvbv5-dev:$ARCH_SUFFIX \
               libudev-dev:$ARCH_SUFFIX
+
+            if [ -n "$PKG_CONFIG_CROSS_LIB_DIR" ]; then
+              echo "Setting pkg-config for cross-compilation"
+              echo "PKG_CONFIG_LIBDIR=$PKG_CONFIG_CROSS_LIB_DIR" >> $GITHUB_ENV
+            fi
           fi
         shell: bash