Mercurial > hg > icedtea11
changeset 2615:130888a5c713
PR1983: Support using the system installation of NSS with the SunEC provider
2016-01-29 Andrew John Hughes <gnu.andrew@member.fsf.org>
PR1983: Support using the system installation
of NSS with the SunEC provider
* Makefile.am:
(check-ecc): Make argument dependent on whether
the SunEC provider is enabled or not.
author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
---|---|
date | Sat, 30 Jan 2016 01:25:06 +0000 |
parents | e4660f6210fa |
children | 5971151ecd40 |
files | ChangeLog Makefile.am |
diffstat | 2 files changed, 15 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Jan 30 01:15:16 2016 +0000 +++ b/ChangeLog Sat Jan 30 01:25:06 2016 +0000 @@ -1,3 +1,11 @@ +2016-01-29 Andrew John Hughes <gnu.andrew@member.fsf.org> + + PR1983: Support using the system installation + of NSS with the SunEC provider + * Makefile.am: + (check-ecc): Make argument dependent on whether + the SunEC provider is enabled or not. + 2016-01-29 Andrew John Hughes <gnu.andrew@member.fsf.org> PR1983: Support using the system installation
--- a/Makefile.am Sat Jan 30 01:15:16 2016 +0000 +++ b/Makefile.am Sat Jan 30 01:25:06 2016 +0000 @@ -209,6 +209,12 @@ TESTS_TO_RUN = jtreg $(addprefix check-,$(TEST_SUITES)) endif +if ENABLE_SUNEC +ECC_RESULT = yes +else +ECC_RESULT = no +endif + # Target to ensure a patched OpenJDK tree containing Zero & Shark # and any overlays is available in $(abs_top_builddir)/openjdk OPENJDK_TREE = stamps/overlay.stamp @@ -2367,7 +2373,7 @@ stamps/check-ecc.stamp: stamps/ecccheck.stamp stamps/icedtea.stamp if [ -e $(BUILD_SDK_DIR)/bin/java ] ; then \ - $(BUILD_SDK_DIR)/bin/java -cp $(ECC_CHECK_BUILD_DIR) TestEllipticCurveCryptoSupport yes ; \ + $(BUILD_SDK_DIR)/bin/java -cp $(ECC_CHECK_BUILD_DIR) TestEllipticCurveCryptoSupport $(ECC_RESULT) ; \ fi mkdir -p stamps touch $@