Fix conditional nesting config.mk

This commit is contained in:
Elio Maldonado 2016-06-08 20:29:36 -07:00
parent cb9d721509
commit 671275a78f
1 changed files with 4 additions and 5 deletions

View File

@ -1,7 +1,6 @@
--- ./lib/nss/config.mk.ignore_system_policy 2016-06-08 09:50:41.156814910 -0700
+++ ./lib/nss/config.mk 2016-06-08 09:53:09.874120131 -0700
@@ -100,11 +100,13 @@
ifndef NS_USE_GCC
--- ./lib/nss/config.mk.ignore_system_policy 2016-06-08 20:25:58.841775044 -0700
+++ ./lib/nss/config.mk 2016-06-08 20:27:06.507526784 -0700
@@ -101,10 +101,12 @@
# Export 'mktemp' to be backward compatible with NSS 3.2.x and 3.3.x
# but do not put it in the import library. See bug 142575.
DEFINES += -DWIN32_NSS3_DLL_COMPAT
@ -9,8 +8,8 @@
endif
endif
+ifndef NSS_IGNORE_SYSTEM_POLICY
ifdef POLICY_FILE
+ifndef NSS_IGNORE_SYSTEM_POLICY
DEFINES += -DPOLICY_FILE=\"$(POLICY_FILE)\" -DPOLICY_PATH=\"$(POLICY_PATH)\"
endif
+endif