diff options
author | tinderbox <tinderbox@fae.suse.cz> | 2012-03-16 13:05:22 +0100 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2012-03-16 13:07:28 +0100 |
commit | f62da81eb28c86e0503e5de44e2c3ef2fdd599fc (patch) | |
tree | 43bbdbb5883ede2184fc64e632ba3ed631347329 | |
parent | don't paste content if user cancels html import, fdo#47393 (diff) | |
download | core-f62da81eb28c86e0503e5de44e2c3ef2fdd599fc.tar.gz core-f62da81eb28c86e0503e5de44e2c3ef2fdd599fc.zip |
nss and openssl don't realiably build in parallel
-rw-r--r-- | nss/makefile.mk | 2 | ||||
-rw-r--r-- | openssl/makefile.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nss/makefile.mk b/nss/makefile.mk index 4323887a93eb..ea6f5e6fa4b2 100644 --- a/nss/makefile.mk +++ b/nss/makefile.mk @@ -97,7 +97,7 @@ OUT2LIB=mozilla/dist/out/lib/*$(DLLPOST) mozilla/dist/out/lib/libcrmf.a OUT2BIN=config/nspr-config mozilla/security/nss/nss-config BUILD_DIR=mozilla/security/nss -BUILD_ACTION= $(GNUMAKE) nss_build_all +BUILD_ACTION= $(GNUMAKE) nss_build_all -j1 #See #i105566# && moz#513024# .IF "$(OS)"=="LINUX" BUILD_ACTION+=FREEBL_NO_DEPEND=1 diff --git a/openssl/makefile.mk b/openssl/makefile.mk index 68fb40976efc..f29b567b857d 100644 --- a/openssl/makefile.mk +++ b/openssl/makefile.mk @@ -74,7 +74,7 @@ COMPILER_AND_FLAGS=$(CC) COMPILER_AND_FLAGS+=-fvisibility=hidden .ENDIF -BUILD_ACTION=make build_libs CC='$(COMPILER_AND_FLAGS)' +BUILD_ACTION=make build_libs CC='$(COMPILER_AND_FLAGS)' -j1 OUT2LIB = libssl.* OUT2LIB += libcrypto.* |