summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorS. Nordin <Axiomatic-@users.noreply.github.com>2015-06-20 03:35:51 -0400
committerS. Nordin <Axiomatic-@users.noreply.github.com>2015-06-20 03:35:51 -0400
commit8375789ee615e3fb67b719aa4486195d9ba9d238 (patch)
tree00dc4fedda832f9a9ae62b101d76a6983069fde6 /config
parenta736ec4d283ca87f4aeeace5f119ed7f4f9581c4 (diff)
downloadpalemoon-gre-8375789ee615e3fb67b719aa4486195d9ba9d238.tar.gz
[!] Apply one of Isaac's suggested fixes.
[!] ... this specifically applies to builds that are configured to use --with-system-pixman
Diffstat (limited to 'config')
-rw-r--r--config/config.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/config.mk b/config/config.mk
index 192231647..b9795240d 100644
--- a/config/config.mk
+++ b/config/config.mk
@@ -381,7 +381,7 @@ JAVA_IFACES_PKG_NAME = org/mozilla/interfaces
OS_INCLUDES += $(MOZ_JPEG_CFLAGS) $(MOZ_PNG_CFLAGS) $(MOZ_ZLIB_CFLAGS)
ifndef MOZ_TREE_PIXMAN
-OS_INCLUDES += $(pkg-config --cflags pixman-1)
+OS_INCLUDES += $(shell pkg-config --cflags pixman-1 || true)
endif
# NSPR_CFLAGS and NSS_CFLAGS must appear ahead of OS_INCLUDES to avoid Linux