guix: Specify native compiler explicitly

hebasto · Sep 30, 2024 · 9ed54be · 9ed54be
1 parent b6a3350
commit 9ed54be
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
@@ -72,6 +72,12 @@ unset OBJCPLUS_INCLUDE_PATH
 export C_INCLUDE_PATH="${NATIVE_GCC}/include"
 export CPLUS_INCLUDE_PATH="${NATIVE_GCC}/include/c++:${NATIVE_GCC}/include"
 
+echo --------------------------------------------------
+ls -l "${NATIVE_GCC}/bin"
+export native_qt_cc="${NATIVE_GCC}/bin/gcc"
+export native_qt_cxx="${NATIVE_GCC}/bin/g++"
+echo --------------------------------------------------
+
 case "$HOST" in
     *darwin*) export LIBRARY_PATH="${NATIVE_GCC}/lib" ;; # Required for qt/qmake
     *mingw*) export LIBRARY_PATH="${NATIVE_GCC}/lib" ;;

diff --git a/depends/packages/native_qt.mk b/depends/packages/native_qt.mk
@@ -62,6 +62,8 @@ $(package)_config_opts += -no-feature-qtattributionsscanner
 $(package)_config_opts += -no-feature-qtdiag
 $(package)_config_opts += -no-feature-qtplugininfo
 
+$(package)_config_env := CC="$$($(package)_cc)"
+$(package)_config_env += CXX="$$($(package)_cxx)"
 endef
 
 define $(package)_fetch_cmds