smallsolar
/
kiwix-build
mirror of https://github.com/kiwix/kiwix-build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[WIP] Set the LD_LIBRARY_PATH only if cross_comp_flags.

This commit is contained in:
Matthieu Gautier 2023-10-20 12:07:11 +02:00
parent 9fbcb26f33
commit 11d829bfff
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
kiwixbuild/buildenv.py
View File

@ -127,11 +127,6 @@ class BuildEnv:
env['PATH'] = ':'.join([pj(self.install_dir, 'bin'), env['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['QMAKE_CXXFLAGS'] = " ".join(['-I'+pj(self.install_dir, 'include'), env['QMAKE_CXXFLAGS']])
env['CPPFLAGS'] = " ".join(['-I'+pj(self.install_dir, 'include'), env['CPPFLAGS']]) env['CPPFLAGS'] = " ".join(['-I'+pj(self.install_dir, 'include'), env['CPPFLAGS']])
env['QMAKE_LFLAGS'] = " ".join(['-L'+pj(self.install_dir, 'lib'), env['QMAKE_LFLAGS'] = " ".join(['-L'+pj(self.install_dir, 'lib'),
@ -142,6 +137,10 @@ class BuildEnv:
env['LDFLAGS']]) env['LDFLAGS']])
if cross_comp_flags: 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) self.platformInfo.set_comp_flags(env)
if cross_compilers: if cross_compilers:
self.platformInfo.set_compiler(env) self.platformInfo.set_compiler(env)