diff options
| author | fanquake <fanquake@gmail.com> | 2024-07-17 11:46:00 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-07-25 14:18:22 +0100 |
| commit | 1807760f094b600fdebe4ebd0018e4fd5d506ce9 (patch) | |
| tree | 78da36aa99e0f07b9a24f41bb5ce247e53f22105 /contrib | |
| parent | 0b2aeee21d24645394d70086e992408948952952 (diff) | |
guix: improve ENV unsetting for macOS
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/guix/libexec/build.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index 9bc8c0e75d..fa6933b332 100755 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -71,11 +71,9 @@ unset OBJCPLUS_INCLUDE_PATH export C_INCLUDE_PATH="${NATIVE_GCC}/include" export CPLUS_INCLUDE_PATH="${NATIVE_GCC}/include/c++:${NATIVE_GCC}/include" -export OBJC_INCLUDE_PATH="${NATIVE_GCC}/include" -export OBJCPLUS_INCLUDE_PATH="${NATIVE_GCC}/include/c++:${NATIVE_GCC}/include" case "$HOST" in - *darwin*) export LIBRARY_PATH="${NATIVE_GCC}/lib" ;; + *darwin*) export LIBRARY_PATH="${NATIVE_GCC}/lib" ;; # Required for qt/qmake *mingw*) export LIBRARY_PATH="${NATIVE_GCC}/lib" ;; *) NATIVE_GCC_STATIC="$(store_path gcc-toolchain static)" @@ -180,6 +178,14 @@ make -C depends --jobs="$JOBS" HOST="$HOST" \ x86_64_linux_NM=x86_64-linux-gnu-gcc-nm \ x86_64_linux_STRIP=x86_64-linux-gnu-strip +case "$HOST" in + *darwin*) + # Unset now that Qt is built + unset C_INCLUDE_PATH + unset CPLUS_INCLUDE_PATH + unset LIBRARY_PATH + ;; +esac ########################### # Source Tarball Building # |