Bug 1280846 - cpputil: don't compile in unnecessary files if NSS_BUIL…

…D_UTIL_ONLY, r=franziskus --HG-- extra : histedit_source : 168ee6053b36c58c571c19667243b494b87c0b51
sailfishos-mirror · Jul 3, 2017 · f3abb53 · f3abb53
1 parent f04ae27
commit f3abb53
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/cpputil/manifest.mn b/cpputil/manifest.mn
@@ -8,11 +8,16 @@ DEPTH      = ..
 MODULE = nss
 LIBRARY_NAME = cpputil
 
+ifeq ($(NSS_BUILD_UTIL_ONLY),1)
+CPPSRCS = \
+      $(NULL)
+else
 CPPSRCS = \
       dummy_io.cc \
       dummy_io_fwd.cc \
       tls_parser.cc \
       $(NULL)
+endif
 
 EXPORTS = \
       $(NULL)
diff --git a/gtests/manifest.mn b/gtests/manifest.mn
@@ -13,7 +13,6 @@ LIB_SRCDIRS = \
 ifneq ($(NSS_BUILD_WITHOUT_UTIL),1)
 UTIL_SRCDIRS = \
 	util_gtest \
-	der_gtest \
 	$(NULL)
 endif
 
@@ -22,6 +21,7 @@ ifneq ($(NSS_BUILD_UTIL_ONLY),1)
 NSS_SRCDIRS = \
 	certdb_gtest \
 	certhigh_gtest \
+	der_gtest \
 	pk11_gtest \
 	softoken_gtest \
 	ssl_gtest \