pengjunjie/build_tools
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/build_tools.git synced 2026-02-10 20:45:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'Fix desktop build' (#152) from fix/sysroot into release/v9.2.0

Browse Source 
Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/build_tools/pulls/152
This commit is contained in:
Oleg Korshul
2025-11-14 18:04:41 +00:00
parent 354e4a6a04 acf75749c2
commit dd148a105e
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/base.py
View File

@ -1894,7 +1894,6 @@ def set_sysroot_env():
if "linux" == host_platform() and config.option("sysroot") != "": if "linux" == host_platform() and config.option("sysroot") != "":
os.environ['PATH'] = config.option("sysroot") + "/usr/bin:" + get_env("PATH") os.environ['PATH'] = config.option("sysroot") + "/usr/bin:" + get_env("PATH")
os.environ['LD_LIBRARY_PATH'] = config.get_custom_sysroot_lib() os.environ['LD_LIBRARY_PATH'] = config.get_custom_sysroot_lib()
os.environ['PKG_CONFIG_PATH'] = config.get_custom_sysroot_lib() + "/pkgconfig"
os.environ['CC'] = config.get_custom_sysroot_bin() + "/gcc" os.environ['CC'] = config.get_custom_sysroot_bin() + "/gcc"
os.environ['CXX'] = config.get_custom_sysroot_bin() + "/g++" os.environ['CXX'] = config.get_custom_sysroot_bin() + "/g++"
os.environ['CFLAGS'] = "--sysroot=" + config.option("sysroot") os.environ['CFLAGS'] = "--sysroot=" + config.option("sysroot")

1
scripts/qmake.py
View File

@ -103,6 +103,7 @@ def make(platform, project, qmake_config_addon="", is_no_errors=False):
if "" != config.option("sysroot"): if "" != config.option("sysroot"):
os.environ['QMAKE_CUSTOM_SYSROOT'] = config.option("sysroot") os.environ['QMAKE_CUSTOM_SYSROOT'] = config.option("sysroot")
os.environ['PKG_CONFIG_PATH'] = config.get_custom_sysroot_lib() + "/pkgconfig"
base.cmd_exe(qmake_app, build_params) base.cmd_exe(qmake_app, build_params)