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

Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/build_tools/pulls/152

scripts/base.py

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

scripts/qmake.py

@@ -100,11 +100,15 @@ def make(platform, project, qmake_config_addon="", is_no_errors=False):
     if "1" == config.option("use-clang"):
       build_params.append("-spec")
       build_params.append("linux-clang-libc++")
+      
+    if "" != 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)
+    
     if "" != config.option("sysroot"):
       base.set_sysroot_env()
-      base.cmd_exe(qmake_app, build_params) # calls cmd_exe to pass os.env
-    else:
-      base.cmd(qmake_app, build_params)
 
     base.correct_makefile_after_qmake(platform, makefile)
     if ("1" == config.option("clean")):