From 0db7ae9e2bb632dd224324efa077b26144e4189d Mon Sep 17 00:00:00 2001 From: Lephenixnoir Date: Sat, 30 Jan 2021 23:01:28 +0100 Subject: [PATCH] cmake: detect compiler install path in a LANG-agnostic way --- fxsdk/cmake/FX9860G.cmake | 4 ++-- fxsdk/cmake/FXCG50.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fxsdk/cmake/FX9860G.cmake b/fxsdk/cmake/FX9860G.cmake index 00296bc..baa4056 100644 --- a/fxsdk/cmake/FX9860G.cmake +++ b/fxsdk/cmake/FX9860G.cmake @@ -26,8 +26,8 @@ set(FXSDK_CMAKE_MODULE_PATH "${FXSDK_CMAKE_MODULE_PATH}") # Determine compiler install path execute_process( COMMAND ${CMAKE_C_COMPILER} --print-search-dirs - COMMAND grep install - COMMAND sed "s/install: //" + COMMAND head -n 1 + COMMAND sed -E "s/^[^:]+: //" OUTPUT_VARIABLE FXSDK_COMPILER_INSTALL OUTPUT_STRIP_TRAILING_WHITESPACE ) diff --git a/fxsdk/cmake/FXCG50.cmake b/fxsdk/cmake/FXCG50.cmake index c23eb60..b5ea502 100644 --- a/fxsdk/cmake/FXCG50.cmake +++ b/fxsdk/cmake/FXCG50.cmake @@ -26,8 +26,8 @@ set(FXSDK_CMAKE_MODULE_PATH "${FXSDK_CMAKE_MODULE_PATH}") # Determine compiler install path execute_process( COMMAND ${CMAKE_C_COMPILER} --print-search-dirs - COMMAND grep install - COMMAND sed "s/install: //" + COMMAND head -n 1 + COMMAND sed -E "s/^[^:]+: //" OUTPUT_VARIABLE FXSDK_COMPILER_INSTALL OUTPUT_STRIP_TRAILING_WHITESPACE )