building X4 on SMP boxes, fix.
The toplevel Makefile in xc/ wipes out make's jobserver mode.
(Compacting $(MAKE) and $(MAKE_OPTS) in one variable confuses it.)
The following patch splits the two out, significantly reducing compile time.
Even on UP systems, make -j2 is a win.
This ought to cut some time off those builds.
--Dan
--- orig/xc/Makefile Sun Nov 19 07:03:46 2000
+++ xc/Makefile Sun Nov 19 07:04:06 2000
@@ -25,8 +25,8 @@
FLAGS = $(MFLAGS) -f Makefile.ini BOOTSTRAPCFLAGS="$(BOOTSTRAPCFLAGS)" CC="$(CC)"
all:
- @$(MAKE_CMD) xmakefile-exists || $(MAKE) all-initial
- @$(MAKE_CMD) $@
+ @$(MAKE) $(MAKE_OPTS) xmakefile-exists || $(MAKE) all-initial
+ @$(MAKE) $(MAKE_OPTS) $@
all-initial:
@echo Please use make World, or on NT use nmake World.Win32.
@@ -59,12 +59,12 @@
fi
cd $(IMAKESRC) && $(MAKE) $(FLAGS) clean
$(MAKE) $(MFLAGS) Makefile.boot
- $(MAKE_CMD) $(MFLAGS) VerifyOS
- $(MAKE_CMD) $(MFLAGS) Makefiles
- $(MAKE_CMD) $(MFLAGS) clean BOOTSTRAPSUBDIRS=
- $(MAKE_CMD) $(MFLAGS) includes
- $(MAKE_CMD) $(MFLAGS) depend
- $(MAKE_CMD) $(MFLAGS) $(WORLDOPTS) World
+ $(MAKE) $(MAKE_OPTS) $(MFLAGS) VerifyOS
+ $(MAKE) $(MAKE_OPTS) $(MFLAGS) Makefiles
+ $(MAKE) $(MAKE_OPTS) $(MFLAGS) clean BOOTSTRAPSUBDIRS=
+ $(MAKE) $(MAKE_OPTS) $(MFLAGS) includes
+ $(MAKE) $(MAKE_OPTS) $(MFLAGS) depend
+ $(MAKE) $(MAKE_OPTS) $(MFLAGS) $(WORLDOPTS) World
@echo ""
@date
@echo ""
@@ -121,15 +121,15 @@
-if exist xmakefile.bak del xmakefile.bak
-if exist xmakefile ren xmakefile xmakefile.bak
$(IMAKE:/=\) -s xmakefile -I$(IRULESRC) $(IMAKE_DEFINES) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR)
- $(MAKE_CMD) $(MFLAGS) VerifyOS
- $(MAKE_CMD) $(MFLAGS) Makefiles
- $(MAKE_CMD) $(MFLAGS) clean
+ $(MAKE) $(MAKE_OPTS) $(MFLAGS) VerifyOS
+ $(MAKE) $(MAKE_OPTS) $(MFLAGS) Makefiles
+ $(MAKE) $(MAKE_OPTS) $(MFLAGS) clean
cd $(CONFIGSRC)\util
$(MAKE) mkdirhier.exe
cd ..\..
- $(MAKE_CMD) $(MFLAGS) includes
- $(MAKE_CMD) $(MFLAGS) depend
- $(MAKE_CMD) $(MFLAGS) $(WIN32WORLDOPTS)
+ $(MAKE) $(MAKE_OPTS) $(MFLAGS) includes
+ $(MAKE) $(MAKE_OPTS) $(MFLAGS) depend
+ $(MAKE) $(MAKE_OPTS) $(MFLAGS) $(WIN32WORLDOPTS)
@echo :
@echo :
@echo Full build of $(RELEASE) of the X Window System complete.
@@ -165,30 +165,30 @@
# a copy of every rule that might be invoked at top level
clean:
- $(MAKE_CMD) $@
+ $(MAKE) $(MAKE_OPTS) $@
dangerous_strip_clean:
- $(MAKE_CMD) $@
+ $(MAKE) $(MAKE_OPTS) $@
depend:
- $(MAKE_CMD) $@
+ $(MAKE) $(MAKE_OPTS) $@
Everything:
- $(MAKE_CMD) $@
+ $(MAKE) $(MAKE_OPTS) $@
external.ln:
- $(MAKE_CMD) $@
+ $(MAKE) $(MAKE_OPTS) $@
includes:
- $(MAKE_CMD) $@
+ $(MAKE) $(MAKE_OPTS) $@
install.sdk:
- $(MAKE_CMD) $@
+ $(MAKE) $(MAKE_OPTS) $@
install.ln:
- $(MAKE_CMD) $@
+ $(MAKE) $(MAKE_OPTS) $@
install.man:
- $(MAKE_CMD) $@
+ $(MAKE) $(MAKE_OPTS) $@
install:
- $(MAKE_CMD) $@
+ $(MAKE) $(MAKE_OPTS) $@
Makefiles:
- $(MAKE_CMD) $@
+ $(MAKE) $(MAKE_OPTS) $@
man_keywords:
- $(MAKE_CMD) $@
+ $(MAKE) $(MAKE_OPTS) $@
tags:
- $(MAKE_CMD) $@
+ $(MAKE) $(MAKE_OPTS) $@
VerifyOS:
- $(MAKE_CMD) $@
+ $(MAKE) $(MAKE_OPTS) $@
Reply to: