diff --git a/kiwixbuild/dependencies/base.py b/kiwixbuild/dependencies/base.py
index feb8d03..bc008a2 100644
--- a/kiwixbuild/dependencies/base.py
+++ b/kiwixbuild/dependencies/base.py
@@ -312,6 +312,7 @@ class MakeBuilder(Builder):
         env = Defaultdict(str, os.environ)
         if self.buildEnv.platformInfo.static:
             env['CFLAGS'] = env['CFLAGS'] + ' -fPIC'
+            env['CXXFLAGS'] = env['CXXFLAGS'] + ' -fPIC'
         if self.configure_env:
             for k in self.configure_env:
                 if k.startswith('_format_'):
@@ -367,6 +368,7 @@ class CMakeBuilder(MakeBuilder):
         env = Defaultdict(str, os.environ)
         if self.buildEnv.platformInfo.static:
             env['CFLAGS'] = env['CFLAGS'] + ' -fPIC'
+            env['CXXFLAGS'] = env['CXXFLAGS'] + ' -fPIC'
         if self.configure_env:
             for k in self.configure_env:
                 if k.startswith('_format_'):
diff --git a/kiwixbuild/dependencies/xapian.py b/kiwixbuild/dependencies/xapian.py
index 5816645..c26307c 100644
--- a/kiwixbuild/dependencies/xapian.py
+++ b/kiwixbuild/dependencies/xapian.py
@@ -18,8 +18,8 @@ class Xapian(Dependency):
 
     class Builder(MakeBuilder):
         configure_option = "--disable-sse --disable-backend-chert --disable-backend-inmemory --disable-documentation"
-        configure_env = {'_format_LDFLAGS': "-L{buildEnv.install_dir}/{buildEnv.libprefix}",
-                         '_format_CXXFLAGS': "-I{buildEnv.install_dir}/include"}
+        configure_env = {'_format_LDFLAGS': "{env.LDFLAGS} -L{buildEnv.install_dir}/{buildEnv.libprefix}",
+                         '_format_CXXFLAGS': "{env.CXXFLAGS} -I{buildEnv.install_dir}/include"}
 
         @classmethod
         def get_dependencies(cls, platformInfo, allDeps):