Prechádzať zdrojové kódy

* DDon't default to using -j4 in MAKEFLAGS, instead add a MAKEJOBS param

Bryan Drewery 16 rokov pred
rodič
commit
9933579891
4 zmenil súbory, kde vykonal 5 pridanie a 1 odobranie
  1. 1 1
      Makefile.in
  2. 2 0
      autotools/configure.ac
  3. 1 0
      configure
  4. 1 0
      doc/UPDATES

+ 1 - 1
Makefile.in

@@ -54,7 +54,7 @@ _CFLGS = -fno-strict-aliasing -W -Wformat \
 #-Wconversion
 #-Wtraditional
 
-MAKEFLAGS = -s -j4
+MAKEFLAGS = -s @MAKEJOBS@
 
 MAKE_BIN = $(MAKE) 'MAKE=$(MAKE)' 'CXX=$(CXX)' 'LD=$(LD)' \
 'CCDEPMODE=$(CCDEPMODE)' 'BRANCH=$(BRANCH)' 'COMMIT=$(COMMIT_SHORT)' 'BUILDTS=$(BUILDTS)' 'VERSION=$(VERSION)' \

+ 2 - 0
autotools/configure.ac

@@ -63,6 +63,8 @@ EGG_CHECK_RANDOM_MAX
 EGG_CHECK_CCSTATIC
 AC_SUBST(CCDEBUG)dnl
 
+AC_SUBST(MAKEJOBS)dnl
+
 #checkpoint
 AC_CACHE_SAVE 
 

+ 1 - 0
configure

@@ -648,6 +648,7 @@ VERSION
 LIBOBJS
 SSL_LIBS
 SSL_INCLUDES
+MAKEJOBS
 CCDEBUG
 STATIC
 BUILDARCH

+ 1 - 0
doc/UPDATES

@@ -4,6 +4,7 @@
 * cmd_die no longer puts user's nick into the quit msg.
 * Update rbl list, 'set -yes rbl-servers -' to get new list.
 * Update server list, 'set -yes servers -' and 'set -yes servers6 -' to get new list.
+* Fix default compile so it doesn't use a ton of processes.
 
 1.3 - http://wraith.botpack.net/milestone/1.3
 * Binary / shell / startup changes