aboutsummaryrefslogtreecommitdiff
path: root/depends
diff options
context:
space:
mode:
authorfanquake <fanquake@gmail.com>2024-07-12 15:17:06 +0100
committerfanquake <fanquake@gmail.com>2024-07-25 14:18:25 +0100
commitbda537f7c484d61a55a72c5856f2d4420664db8f (patch)
tree6846385edd7d1e25a631c4777e7c2e5dfde0bec0 /depends
parent1807760f094b600fdebe4ebd0018e4fd5d506ce9 (diff)
depends: remove ENV unsetting for darwin
Now that we use the native compiler, and have fixed Qt, and these vars are unset it Guix, we can remove the unsetting from our compiler command here. Fixes #21552.
Diffstat (limited to 'depends')
-rw-r--r--depends/hosts/darwin.mk10
1 files changed, 2 insertions, 8 deletions
diff --git a/depends/hosts/darwin.mk b/depends/hosts/darwin.mk
index 564381d1e9..a50e36110d 100644
--- a/depends/hosts/darwin.mk
+++ b/depends/hosts/darwin.mk
@@ -50,17 +50,11 @@ darwin_STRIP=$(shell $(SHELL) $(.SHELLFLAGS) "command -v llvm-strip")
# Disable adhoc codesigning (for now) when using LLVM tooling, to avoid
# non-determinism issues with the Identifier field.
-darwin_CC=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \
- -u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH \
- -u LIBRARY_PATH \
- $(clang_prog) --target=$(host) \
+darwin_CC=$(clang_prog) --target=$(host) \
-isysroot$(OSX_SDK) -nostdlibinc \
-iwithsysroot/usr/include -iframeworkwithsysroot/System/Library/Frameworks
-darwin_CXX=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \
- -u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH \
- -u LIBRARY_PATH \
- $(clangxx_prog) --target=$(host) \
+darwin_CXX=$(clangxx_prog) --target=$(host) \
-isysroot$(OSX_SDK) -nostdlibinc \
-iwithsysroot/usr/include/c++/v1 \
-iwithsysroot/usr/include -iframeworkwithsysroot/System/Library/Frameworks