mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-12 17:29:02 +08:00
29 lines
1.3 KiB
Diff
29 lines
1.3 KiB
Diff
|
diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
|
||
|
|
index 0040b6c..bfad10d 100644
|
||
|
|
--- a/mkspecs/features/toolchain.prf
|
||
|
|
+++ b/mkspecs/features/toolchain.prf
|
||
|
|
@@ -288,9 +288,12 @@
|
||
|
|
}
|
||
|
|
}
|
||
|
|
}
|
||
|
|
- isEmpty(QMAKE_DEFAULT_LIBDIRS)|isEmpty(QMAKE_DEFAULT_INCDIRS): \
|
||
|
|
+ isEmpty(QMAKE_DEFAULT_INCDIRS): \
|
||
|
|
!integrity: \
|
||
|
|
- error("failed to parse default search paths from compiler output")
|
||
|
|
+ error("failed to parse default include paths from compiler output")
|
||
|
|
+ isEmpty(QMAKE_DEFAULT_LIBDIRS): \
|
||
|
|
+ !integrity:!darwin: \
|
||
|
|
+ error("failed to parse default library paths from compiler output")
|
||
|
|
QMAKE_DEFAULT_LIBDIRS = $$unique(QMAKE_DEFAULT_LIBDIRS)
|
||
|
|
} else: ghs {
|
||
|
|
cmd = $$QMAKE_CXX $$QMAKE_CXXFLAGS -$${LITERAL_HASH} -o /tmp/fake_output /tmp/fake_input.cpp
|
||
|
|
@@ -411,7 +414,7 @@
|
||
|
|
QMAKE_DEFAULT_INCDIRS = $$split(INCLUDE, $$QMAKE_DIRLIST_SEP)
|
||
|
|
}
|
||
|
|
|
||
|
|
- unix:if(!cross_compile|host_build) {
|
||
|
|
+ unix:!darwin:if(!cross_compile|host_build) {
|
||
|
|
isEmpty(QMAKE_DEFAULT_INCDIRS): QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include
|
||
|
|
isEmpty(QMAKE_DEFAULT_LIBDIRS): QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib
|
||
|
|
}
|