Skip to content

Commit bda537f

Browse files
committed
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.
1 parent 1807760 commit bda537f

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

depends/hosts/darwin.mk

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,11 @@ darwin_STRIP=$(shell $(SHELL) $(.SHELLFLAGS) "command -v llvm-strip")
5050
# Disable adhoc codesigning (for now) when using LLVM tooling, to avoid
5151
# non-determinism issues with the Identifier field.
5252

53-
darwin_CC=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \
54-
-u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH \
55-
-u LIBRARY_PATH \
56-
$(clang_prog) --target=$(host) \
53+
darwin_CC=$(clang_prog) --target=$(host) \
5754
-isysroot$(OSX_SDK) -nostdlibinc \
5855
-iwithsysroot/usr/include -iframeworkwithsysroot/System/Library/Frameworks
5956

60-
darwin_CXX=env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH \
61-
-u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH \
62-
-u LIBRARY_PATH \
63-
$(clangxx_prog) --target=$(host) \
57+
darwin_CXX=$(clangxx_prog) --target=$(host) \
6458
-isysroot$(OSX_SDK) -nostdlibinc \
6559
-iwithsysroot/usr/include/c++/v1 \
6660
-iwithsysroot/usr/include -iframeworkwithsysroot/System/Library/Frameworks

0 commit comments

Comments
 (0)