[tor-commits] [tor-browser-build/master] Bug 40103: Add i386 pkg-config path for linux-i686

[gk at torproject.org]

commit 23ef6cf3079b53809ad91e9fa3e773ae16661a6a
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Sat Sep 19 13:31:06 2020 +0000

    Bug 40103: Add i386 pkg-config path for linux-i686
---
 projects/firefox/build | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/projects/firefox/build b/projects/firefox/build
index 63be146..d8e6099 100644
--- a/projects/firefox/build
+++ b/projects/firefox/build
@@ -30,6 +30,12 @@ export LLVM_CONFIG="/var/tmp/dist/clang/bin/llvm-config"
   [% IF ! c("var/asan") -%]
     export PATH="/var/tmp/dist/clang/bin:$PATH"
   [% END -%]
+  [% IF c("var/linux-i686") %]
+    # Exporting `PKG_CONFIG_PATH` in the mozconfig file is causing build
+    # breakage in Rust code. It seems that environment variable is not passed
+    # down properly in that case. Thus, we set it here in the build script.
+    export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}:/usr/lib/i386-linux-gnu/pkgconfig"
+  [% END -%]
 [% END -%]
 
 [% IF c("var/rlbox") -%]