Ticket #68204: patch-xcode15.diff
File patch-xcode15.diff, 1.2 KB (added by devernay (Frédéric Devernay), 14 months ago) |
---|
-
mkspecs/features/toolchain.prf
old new 288 288 } 289 289 } 290 290 } 291 isEmpty(QMAKE_DEFAULT_ LIBDIRS)|isEmpty(QMAKE_DEFAULT_INCDIRS): \291 isEmpty(QMAKE_DEFAULT_INCDIRS): \ 292 292 !integrity: \ 293 error("failed to parse default search paths from compiler output") 293 error("failed to parse default include paths from compiler output") 294 isEmpty(QMAKE_DEFAULT_LIBDIRS): \ 295 !integrity:!darwin: \ 296 error("failed to parse default library paths from compiler output") 294 297 QMAKE_DEFAULT_LIBDIRS = $$unique(QMAKE_DEFAULT_LIBDIRS) 295 298 } else: ghs { 296 299 cmd = $$QMAKE_CXX $$QMAKE_CXXFLAGS -$${LITERAL_HASH} -o /tmp/fake_output /tmp/fake_input.cpp … … 412 415 QMAKE_DEFAULT_INCDIRS = $$split(INCLUDE, $$QMAKE_DIRLIST_SEP) 413 416 } 414 417 415 unix: if(!cross_compile|host_build) {418 unix:!darwin:if(!cross_compile|host_build) { 416 419 isEmpty(QMAKE_DEFAULT_INCDIRS): QMAKE_DEFAULT_INCDIRS = /usr/include /usr/local/include 417 420 isEmpty(QMAKE_DEFAULT_LIBDIRS): QMAKE_DEFAULT_LIBDIRS = /lib /usr/lib 418 421 }