diff options
| author | Daiki Ueno <dueno@redhat.com> | 2017-07-03 16:26:08 +0200 |
|---|---|---|
| committer | Daiki Ueno <dueno@redhat.com> | 2017-07-03 16:26:08 +0200 |
| commit | 885ab3202adc5ba0b1f56c2c69bb4bd0c87c0714 (patch) | |
| tree | 6f17c802a1d24f1350b787fa772b8984c897cbb1 | |
| parent | 515d46cb970ecdb47bb384efef64ed7a5083cf3f (diff) | |
| download | nss-hg-885ab3202adc5ba0b1f56c2c69bb4bd0c87c0714.tar.gz | |
Bug 1280846 - cpputil: don't compile in unnecessary files if NSS_BUILD_UTIL_ONLY, r=franziskus
| -rw-r--r-- | cpputil/manifest.mn | 5 | ||||
| -rw-r--r-- | gtests/manifest.mn | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/cpputil/manifest.mn b/cpputil/manifest.mn index ad2d31b45..c515b8c2c 100644 --- 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 index 3bc366432..a435f8733 100644 --- 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 \ |