summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Varga <pvarga@inf.u-szeged.hu>2021-01-14 13:55:07 +0100
committerPeter Varga <pvarga@inf.u-szeged.hu>2021-01-25 20:08:32 +0100
commit192790230e9b82f9db2ffca511f14a694e772a75 (patch)
tree1fa8f493fe1c62a8d97537d837f1eed7eaf64323
parent9841acdec527749c37f845c5dc6a94a1a4ab3357 (diff)
Do not set open files limit for linking if not necessary
This is a workaround to fix build with ccache. Increasing the open files limit is not necessary with gold and lld linker. Prepending ulimit before the linker command breaks the build if Qt is configured to be built with ccache. Change-Id: I847d9f0a9a36f6a2480ea6b0a11f9973bae942e3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--src/core/core_module.pro6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/core_module.pro b/src/core/core_module.pro
index 733e40534..520b452f7 100644
--- a/src/core/core_module.pro
+++ b/src/core/core_module.pro
@@ -42,8 +42,10 @@ QMAKE_INFO_PLIST = Info_mac.plist
CONFIG -= bsymbolic_functions
linux {
- QMAKE_LINK="ulimit -n 4096 && $$QMAKE_LINK"
- QMAKE_LINK_SHLIB="ulimit -n 4096 && $$QMAKE_LINK_SHLIB"
+ !ccache:!use_gold_linker:!use_lld_linker {
+ QMAKE_LINK="ulimit -n 4096 && $$QMAKE_LINK"
+ QMAKE_LINK_SHLIB="ulimit -n 4096 && $$QMAKE_LINK_SHLIB"
+ }
qtConfig(separate_debug_info): QMAKE_POST_LINK="cd $(DESTDIR) && $(STRIP) --strip-unneeded $(TARGET)"
}