Skip to content

Commit 478d783

Browse files
CI: move PKG_CONFIG_PATH into shell script
1 parent f422703 commit 478d783

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,15 +111,13 @@ jobs:
111111
- name: Set up toolchain for ${{ matrix.name }}
112112
run: |
113113
CROSS_TOOLCHAIN_URL="https://github.com/cross-tools/musl-cross/releases/download/20250520/${{ matrix.triplet }}.tar.xz"
114-
PKG_CONFIG_PATH="${{ env.cross_dir }}/${{ matrix.triplet }}/${{ matrix.triplet }}/sysroot/usr/lib/pkgconfig"
115114
116115
sudo mkdir -m 777 -p "${{ env.cross_dir }}"
117116
env \
118117
CROSS_TRIPLET="${{ matrix.triplet }}" \
119118
CROSS_TOOLCHAIN_URL="$CROSS_TOOLCHAIN_URL" \
120119
CROSS_TOOLCHAIN_SHA256="${{ matrix.sha256 }}" \
121120
CROSS_DIR="${{ env.cross_dir }}" \
122-
PKG_CONFIG_PATH="$PKG_CONFIG_PATH" \
123121
.github/workflows/scripts/cross-setup.sh
124122
- name: Build for ${{ matrix.name }}
125123
run: |

.github/workflows/scripts/cross-setup.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ CROSS_BASE="$CROSS_DIR/$CROSS_TRIPLET"
1212
CROSS_SRC="$CROSS_BASE/src"
1313
CROSS_USR="$CROSS_BASE/$CROSS_TRIPLET/sysroot/usr"
1414
PATH="$CROSS_BASE/bin:$PATH"
15-
export PATH
15+
PKG_CONFIG_PATH="$CROSS_DIR/$CROSS_TRIPLET/$CROSS_TRIPLET/sysroot/usr/lib/pkgconfig"
16+
export PATH PKG_CONFIG_PATH
1617

1718
libmnl_name=libmnl-1.0.5
1819
libmnl_tar=$libmnl_name.tar.bz2

0 commit comments

Comments
 (0)