Commit 81f2cb6b authored by Giulio Benetti's avatar Giulio Benetti

Bug 1603438 - Fix native tools build failure due to lack of zlib include dir if external r=jcj

Add ZLIB_INCLUDE_DIR variable

On Linux platform[1], the build system forces to use zlib from the
system instead of compiling the one located intree.

The following error is raised when the zlib header is installed
somewhere else than in the default system include path:

	ssl3con.c:39:18: fatal error: zlib.h: No such file or directory
	 #include "zlib.h"

The same trick setup for sqlite include directory is reproduced for
zlib. The build system disallows in any manner to give arguments to the
compiler explicity.

The variable ZLIB_INCLUDE_DIR point to the directory where the zlib
header is located.

[1]:
https://hg.mozilla.org/projects/nss/file/NSS_3_33_BRANCH/coreconf/Linux.mk#l180
[2]:
https://hg.mozilla.org/projects/nss/file/NSS_3_33_BRANCH/lib/softoken/manifest.mn#l17

--HG--
extra : rebase_source : c44bcaeb505ac2df346e2f9886a3f6d0d9e4c43c
extra : amend_source : a9cb45d7e7d48c1993b4eedceb4220865b9c2b13
parent 7755a623
......@@ -6,6 +6,10 @@ CORE_DEPTH = ../..
MODULE = nss
ifdef ZLIB_INCLUDE_DIR
INCLUDES += -I$(ZLIB_INCLUDE_DIR)
endif
EXPORTS =
CSRCS = signtool.c \
......
......@@ -5,6 +5,10 @@ CORE_DEPTH = ../..
# DEFINES = -DTRACE
ifdef ZLIB_INCLUDE_DIR
INCLUDES += -I$(ZLIB_INCLUDE_DIR)
endif
EXPORTS = \
ssl.h \
sslt.h \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment