diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-04-17 13:01:01 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-04-17 13:57:59 +0000 |
| commit | 7d204c5d7b36a875a9983d0493f947f467fac29c (patch) | |
| tree | 5a4fae3ef1f54bf89c9361d880ebb35cfb0fb43f /packaging-tools/bld_qtcreator.py | |
| parent | 769438fde20399c298bc273bb2cdbb186aa346c7 (diff) | |
QtCreator: Fix qdoc/libclang workaround for macOS
Change-Id: I20202b207d670951a9edc5301691785bcfca97b1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'packaging-tools/bld_qtcreator.py')
| -rwxr-xr-x | packaging-tools/bld_qtcreator.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/packaging-tools/bld_qtcreator.py b/packaging-tools/bld_qtcreator.py index 4a3cc95ec..ba6db1072 100755 --- a/packaging-tools/bld_qtcreator.py +++ b/packaging-tools/bld_qtcreator.py @@ -295,7 +295,13 @@ if __name__ == "__main__": elif bldinstallercommon.is_win_platform(): qdoc_environment['PATH'] = os.pathsep.join([qdoc_lib_path, qdoc_environment['PATH']]) else: - qdoc_environment['DYLD_LIBRARY_PATH'] = qdoc_lib_path + # macOS System Integrity Protection prevents passing DYLD_LIBRARY_PATH through qdoc_wrapper.sh + # so we have to manually adapt the script instead + with open(os.path.join(qtCreatorBuildDirectory, 'qdoc_wrapper.sh'), 'r') as f: + lines = f.readlines() + lines.insert(1, 'export DYLD_LIBRARY_PATH="' + qdoc_lib_path + '"\n') + with open(os.path.join(qtCreatorBuildDirectory, 'qdoc_wrapper.sh'), 'w') as f: + f.writelines(lines) runInstallCommand("docs", currentWorkingDirectory = qtCreatorBuildDirectory, callerArguments = callerArguments, init_environment = qdoc_environment) |