From 1977f39ecb99ad19794ad62df7ec463e020e42cf Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Sun, 25 Apr 2021 21:47:25 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20Switch:=20Better=20fix=20for=20p?= =?UTF-8?q?kgconfig=20support?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 2 -- CMake/switch/devkita64-libnx.cmake | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 51a008fda..6ebf1a86a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -90,8 +90,6 @@ jobs: working_directory: ~/repo steps: - checkout - # Work around https://github.com/devkitPro/docker/issues/16 - - run: ln -s /opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-pkg-config /opt/devkitpro/devkitA64/bin/ - run: echo deb http://deb.debian.org/debian stretch-backports main > /etc/apt/sources.list.d/debian-backports.list - run: echo deb http://deb.debian.org/debian stretch-backports-sloppy main >> /etc/apt/sources.list.d/debian-backports.list - run: apt-get update && apt-get install -y -t 'stretch-backports*' cmake diff --git a/CMake/switch/devkita64-libnx.cmake b/CMake/switch/devkita64-libnx.cmake index 5e2e568e1..8cd546041 100644 --- a/CMake/switch/devkita64-libnx.cmake +++ b/CMake/switch/devkita64-libnx.cmake @@ -40,7 +40,7 @@ endif() set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}gcc${TOOLCHAIN_SUFFIX}) set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}g++${TOOLCHAIN_SUFFIX}) set(CMAKE_ASM_COMPILER ${TOOLCHAIN_PREFIX}as${TOOLCHAIN_SUFFIX}) -set(PKG_CONFIG_EXECUTABLE ${TOOLCHAIN_PREFIX}pkg-config${TOOLCHAIN_SUFFIX}) +set(PKG_CONFIG_EXECUTABLE ${DEVKITPRO}/portlibs/switch/bin/aarch64-none-elf-pkg-config) set(CMAKE_AR ${TOOLCHAIN_PREFIX}gcc-ar${TOOLCHAIN_SUFFIX} CACHE STRING "") set(CMAKE_RANLIB ${TOOLCHAIN_PREFIX}gcc-ranlib${TOOLCHAIN_SUFFIX} CACHE STRING "") set(CMAKE_LD "/${TOOLCHAIN_PREFIX}ld${TOOLCHAIN_SUFFIX}" CACHE INTERNAL "")