X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=Makefile.org;h=1c4fd984623c59b3d4fe6259ed6c541ad2bc7d0a;hb=c00793da995b6e2d52ac4423dc8d5a8607852ff8;hp=3ecc5c5a0c8050482a24d11cb31e0267dd0ab996;hpb=3149baf83cb703f060b1e6eeb440a45e010a626b;p=openssl.git diff --git a/Makefile.org b/Makefile.org index 3ecc5c5a0c..1c4fd98462 100644 --- a/Makefile.org +++ b/Makefile.org @@ -143,7 +143,7 @@ SDIRS= \ bn ec rsa dsa ecdsa dh ecdh dso engine \ buffer bio stack lhash rand err \ evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui \ - cms pqueue ts jpake srp store cmac ct + cms pqueue ts jpake srp store cmac ct async # keep in mind that the above list is adjusted by ./Configure # according to no-xxx arguments... @@ -437,7 +437,9 @@ test: tests tests: rehash @(cd test && echo "testing..." && \ $(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='$(TESTS)' OPENSSL_DEBUG_MEMORY=on OPENSSL_CONF=../apps/openssl.cnf tests ); - OPENSSL_CONF=apps/openssl.cnf util/opensslwrap.sh version -a + @if [ -z "$(CROSS_COMPILE)" ]; then \ + OPENSSL_CONF=apps/openssl.cnf util/opensslwrap.sh version -a; \ + fi list-tests: @(cd test && \ @@ -466,6 +468,7 @@ errors: $(PERL) util/ck_errf.pl -strict */*.c */*/*.c $(PERL) util/mkerr.pl -recurse -write (cd engines; $(MAKE) PERL=$(PERL) errors) + (cd crypto/ct; $(MAKE) PERL=$(PERL) errors) stacks: $(PERL) util/mkstack.pl -write