Skip to content
Snippets Groups Projects
Commit 8bdd8b89 authored by Anton Mitrofanov's avatar Anton Mitrofanov
Browse files

CI: Fix vlc-contrib linking on macOS

Use pkg-config from the custom PATH.
parent f7074e12
No related branches found
No related tags found
No related merge requests found
...@@ -42,6 +42,7 @@ stages: ...@@ -42,6 +42,7 @@ stages:
_CONTRIB_URL: "https://artifacts.videolan.org/vlc/macos-x86_64/" _CONTRIB_URL: "https://artifacts.videolan.org/vlc/macos-x86_64/"
_XCFLAGS: "-arch x86_64" _XCFLAGS: "-arch x86_64"
_XLDFLAGS: "-arch x86_64" _XLDFLAGS: "-arch x86_64"
_BIN_PATH: /Users/videolanci/sandbox/bin
.variables-macos-arm64: &variables-macos-arm64 .variables-macos-arm64: &variables-macos-arm64
_TRIPLET: "aarch64-apple-darwin19" _TRIPLET: "aarch64-apple-darwin19"
...@@ -50,6 +51,7 @@ stages: ...@@ -50,6 +51,7 @@ stages:
_CONTRIB_URL: "https://artifacts.videolan.org/vlc/macos-arm64/" _CONTRIB_URL: "https://artifacts.videolan.org/vlc/macos-arm64/"
_XCFLAGS: "-arch arm64" _XCFLAGS: "-arch arm64"
_XLDFLAGS: "-arch arm64" _XLDFLAGS: "-arch arm64"
_BIN_PATH: /Users/videolanci/sandbox/bin
.build: .build:
stage: build stage: build
...@@ -147,6 +149,7 @@ build-llvm-mingw-aarch64: ...@@ -147,6 +149,7 @@ build-llvm-mingw-aarch64:
extends: .build extends: .build
script: | script: |
set -x set -x
export PATH="${_BIN_PATH}:$PATH"
LOCAL_INSTALL_DIR=`pwd`/${_TRIPLET} LOCAL_INSTALL_DIR=`pwd`/${_TRIPLET}
export PKG_CONFIG_LIBDIR=${LOCAL_INSTALL_DIR}/lib/pkgconfig export PKG_CONFIG_LIBDIR=${LOCAL_INSTALL_DIR}/lib/pkgconfig
curl -f -o vlc-contrib.txt ${_CONTRIB_URL} curl -f -o vlc-contrib.txt ${_CONTRIB_URL}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment