Merge pull request #126 from dcreager/fix-the-build

Fix the build on i386
dcreager · Oct 26, 2017 · e83276d · e83276d
2 parents c9a9797 + 4ba830a
commit e83276d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,9 @@ env:
   - ARCH=amd64 ENABLE_SHARED_EXECUTABLES=NO
 os:
   - linux
-  - osx
+  # TODO(dcreager): Reenable this once the Travis Mac backlog isn't quite so
+  # horrific.
+  # - osx
 install: .travis/install
 script: .travis/test
 

diff --git a/.travis/test b/.travis/test
@@ -8,6 +8,7 @@ cd .build
 if [ "$TRAVIS_OS_NAME" = linux ]; then
     if [ "$ARCH" = i386 ]; then
         ARCH_FLAGS="-m32"
+        export PKG_CONFIG_PATH=/usr/lib/i386-linux-gnu/pkgconfig
     else
         ARCH_FLAGS=""
     fi