diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-02-28 09:00:16 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-02-28 09:02:48 +0100 |
| commit | 13bd8bbc7fb32d87ac558db049de225a617ab7a7 (patch) | |
| tree | 3887c196b9d33caa62fedb4fbb2fa38ac162b1e1 /openssl | |
| parent | d9fb2a6add269955d168d6d31c0257314ea4e020 (diff) | |
openssl: unset MAKEFLAGS on !MSC as well
This fixes the following build error here:
ar: creating ../libcrypto.a
ar: cryptlib.o: No such file or directory
make[2]: *** [../libcrypto.a] Error 1
Change-Id: I8f746f4ff44c3797583678e47956363c0cd49829
Diffstat (limited to 'openssl')
| -rw-r--r-- | openssl/ExternalProject_openssl.mk | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/openssl/ExternalProject_openssl.mk b/openssl/ExternalProject_openssl.mk index 954fc2b652f2..891dd711dc3b 100644 --- a/openssl/ExternalProject_openssl.mk +++ b/openssl/ExternalProject_openssl.mk @@ -48,8 +48,8 @@ $(call gb_ExternalProject_get_state_target,openssl,build): else $(call gb_ExternalProject_get_state_target,openssl,build): $(call gb_ExternalProject_run,build,\ - MAKE="$(MAKE) -j1" \ - $(if $(filter LINUX FREEBSD ANDROID SOLARIS IOS,$(OS)),./Configure,\ + unset MAKEFLAGS \ + && $(if $(filter LINUX FREEBSD ANDROID SOLARIS IOS,$(OS)),./Configure,\ $(if $(filter WNT,$(OS)),$(PERL) Configure,./config)) \ $(OPENSSL_PLATFORM) \ $(if $(filter ANDROID,$(OS)),\ @@ -59,8 +59,7 @@ $(call gb_ExternalProject_get_state_target,openssl,build): shared no-idea \ $(if $(SYSBASE),-I$(SYSBASE)/usr/include -L$(SYSBASE)/usr/lib)))) \ $(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \ - && export MAKEFLAGS="$(MAKEFLAGS:r=)" \ - && $(MAKE) -j1 build_libs \ + && $(MAKE) build_libs \ CC="$(CC) $(if $(filter-out WNT,$(OS)),\ $(if $(filter TRUE,$(HAVE_GCC_VISIBILITY_FEATURE)),\ -fvisibility=hidden))" \ |