diff options
| author |  David G. Quintas <dgq@google.com> | 2015-08-25 19:17:17 -0700 |
|---|---|---|
| committer | David G. Quintas <dgq@google.com> | 2015-08-25 19:17:17 -0700 |
| commit | fd70b7117e19572e31ecbc4bd12c27435d6d7242 (patch) | |
| tree | bddef37d78e88ef4ed449d92f15dd4de7fc2a8b8 | |
| parent | 901277dd6d4a9378c693e6fe572035c583e91db4 (diff) | |
| parent | 352312cb735be221ee0b1472d311ae1d76973ab7 (diff) | |
Merge pull request #3054 from ctiller/openssl-just-needs-to-build
Dont try to parallelize OpenSSL build
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | templates/Makefile.template | 4 |
2 files changed, 4 insertions, 4 deletions
@@ -1651,8 +1651,8 @@ else $(Q)(cd third_party/openssl ; CC="$(CC) $(PIC_CPPFLAGS) -fvisibility=hidden $(CPPFLAGS_$(CONFIG)) $(OPENSSL_CFLAGS_$(CONFIG)) $(OPENSSL_CFLAGS_EXTRA)" ./config no-asm $(OPENSSL_CONFIG_$(CONFIG))) endif endif - $(Q)$(MAKE) -C third_party/openssl clean - $(Q)(unset CPPFLAGS; $(MAKE) -C third_party/openssl build_crypto build_ssl) + $(Q)$(MAKE) -j 1 -C third_party/openssl clean + $(Q)(unset CPPFLAGS; $(MAKE) -j 1 -C third_party/openssl build_crypto build_ssl) $(Q)mkdir -p $(LIBDIR)/$(CONFIG)/openssl $(Q)cp third_party/openssl/libssl.a third_party/openssl/libcrypto.a $(LIBDIR)/$(CONFIG)/openssl diff --git a/templates/Makefile.template b/templates/Makefile.template index 00582a22f8..797f0ab57f 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -859,8 +859,8 @@ else $(Q)(cd third_party/openssl ; CC="$(CC) $(PIC_CPPFLAGS) -fvisibility=hidden $(CPPFLAGS_$(CONFIG)) $(OPENSSL_CFLAGS_$(CONFIG)) $(OPENSSL_CFLAGS_EXTRA)" ./config no-asm $(OPENSSL_CONFIG_$(CONFIG))) endif endif - $(Q)$(MAKE) -C third_party/openssl clean - $(Q)(unset CPPFLAGS; $(MAKE) -C third_party/openssl build_crypto build_ssl) + $(Q)$(MAKE) -j 1 -C third_party/openssl clean + $(Q)(unset CPPFLAGS; $(MAKE) -j 1 -C third_party/openssl build_crypto build_ssl) $(Q)mkdir -p $(LIBDIR)/$(CONFIG)/openssl $(Q)cp third_party/openssl/libssl.a third_party/openssl/libcrypto.a $(LIBDIR)/$(CONFIG)/openssl |