Skip to content

Commit 332f8dd

Browse files
committed
guix: fix macOS build
These lines were present in the original code, but a comment said: "Required for qt/qmake" Well, not just for qt it seems. Fixes #5.
1 parent c74e161 commit 332f8dd

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

contrib/guix/libexec/build.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ build_CC="${NATIVE_GCC}/bin/gcc -isystem ${NATIVE_GCC}/include"
7474
build_CXX="${NATIVE_GCC}/bin/g++ -isystem ${NATIVE_GCC}/include/c++ -isystem ${NATIVE_GCC}/include"
7575

7676
case "$HOST" in
77+
*darwin*) export LIBRARY_PATH="${NATIVE_GCC}/lib" ;;
7778
*mingw*) export LIBRARY_PATH="${NATIVE_GCC}/lib" ;;
7879
*)
7980
NATIVE_GCC_STATIC="$(store_path gcc-toolchain static)"
@@ -179,6 +180,12 @@ make -C depends --jobs="$JOBS" HOST="$HOST" \
179180
x86_64_linux_NM=x86_64-linux-gnu-gcc-nm \
180181
x86_64_linux_STRIP=x86_64-linux-gnu-strip
181182

183+
case "$HOST" in
184+
*darwin*)
185+
# Unset now that Qt is built
186+
unset LIBRARY_PATH
187+
;;
188+
esac
182189

183190
###########################
184191
# Source Tarball Building #

0 commit comments

Comments
 (0)