From ab2458c1c45c6ae3d8fb7f2742cba49e09735abe Mon Sep 17 00:00:00 2001 From: Matthieu Gautier Date: Wed, 30 Nov 2022 13:54:23 +0100 Subject: [PATCH] Add "static" include dir when compiling native_mixed. --- kiwixbuild/platforms/native.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/kiwixbuild/platforms/native.py b/kiwixbuild/platforms/native.py index 1a0c2c6..4ff2738 100644 --- a/kiwixbuild/platforms/native.py +++ b/kiwixbuild/platforms/native.py @@ -52,10 +52,5 @@ class NativeMixed(NativePlatformInfo): env['PATH'] = ':'.join([pj(static_install_dir, 'bin')] + [env['PATH']]) pkgconfig_path = pj(static_install_dir, static_buildEnv.libprefix, 'pkgconfig') env['PKG_CONFIG_PATH'] = ':'.join([env['PKG_CONFIG_PATH'], pkgconfig_path]) - return env - - def set_comp_flags(self, env): - super().set_comp_flags(env) - static_platform = self.get_platform('native_static') - static_install_dir = static_platform.buildEnv.install_dir env['CPPFLAGS'] = " ".join(['-I'+pj(static_install_dir, 'include'), env['CPPFLAGS']]) + return env