[WIP] Set the LD_LIBRARY_PATH only if cross_comp_flags.

kiwix · Oct 20, 2023 · bf09463 · bf09463
1 parent 3c05803
commit bf09463
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/kiwixbuild/buildenv.py b/kiwixbuild/buildenv.py
@@ -127,11 +127,6 @@ def get_env(self, *, cross_comp_flags, cross_compilers, cross_path):
 
         env['PATH'] = ':'.join([pj(self.install_dir, 'bin'), env['PATH']])
 
-        env['LD_LIBRARY_PATH'] = ':'.join([env['LD_LIBRARY_PATH'],
-                                          pj(self.install_dir, 'lib'),
-                                          pj(self.install_dir, self.libprefix)
-                                          ])
-
         env['QMAKE_CXXFLAGS'] = " ".join(['-I'+pj(self.install_dir, 'include'), env['QMAKE_CXXFLAGS']])
         env['CPPFLAGS'] = " ".join(['-I'+pj(self.install_dir, 'include'), env['CPPFLAGS']])
         env['QMAKE_LFLAGS'] = " ".join(['-L'+pj(self.install_dir, 'lib'),
@@ -142,6 +137,10 @@ def get_env(self, *, cross_comp_flags, cross_compilers, cross_path):
                                    env['LDFLAGS']])
 
         if cross_comp_flags:
+            env['LD_LIBRARY_PATH'] = ':'.join([env['LD_LIBRARY_PATH'],
+                pj(self.install_dir, 'lib'),
+                pj(self.install_dir, self.libprefix)
+            ])
             self.platformInfo.set_comp_flags(env)
         if cross_compilers:
             self.platformInfo.set_compiler(env)