aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorGerd Moellmann2001-10-13 09:58:53 +0000
committerGerd Moellmann2001-10-13 09:58:53 +0000
commitf2164e31dc7c98634267abe52f12b4494fbc7f9a (patch)
treeb0504a6d8a0702c5575876134db1c81bcf3a38b4 /admin
parent75a4e7c5666af1d058cae26e3a175f9eb5781106 (diff)
downloademacs-f2164e31dc7c98634267abe52f12b4494fbc7f9a.tar.gz
emacs-f2164e31dc7c98634267abe52f12b4494fbc7f9a.zip
Add --boot switch for bootstrapping. Logs to
EMACS_ROOT/boot.log, renames previous log file to boot.log.old.
Diffstat (limited to 'admin')
-rw-r--r--admin/ChangeLog5
-rwxr-xr-xadmin/make-emacs9
2 files changed, 14 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 49ab1a38de9..485825e06fc 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
12001-10-13 Gerd Moellmann <gerd@gnu.org>
2
3 * make-emacs: Add --boot switch for bootstrapping. Logs to
4 EMACS_ROOT/boot.log, renames previous log file to boot.log.old.
5
12001-10-05 Gerd Moellmann <gerd@gnu.org> 62001-10-05 Gerd Moellmann <gerd@gnu.org>
2 7
3 * Branch for 21.1. 8 * Branch for 21.1.
diff --git a/admin/make-emacs b/admin/make-emacs
index 83683c41269..fb427540b2d 100755
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -49,6 +49,7 @@ $rc = GetOptions ("help" => \$help,
49 "malloc-check" => \$malloc_check, 49 "malloc-check" => \$malloc_check,
50 "no-mcheck" => \$no_mcheck, 50 "no-mcheck" => \$no_mcheck,
51 "alias" => \$aliasing, 51 "alias" => \$aliasing,
52 "boot" => \$boot,
52 "wall" => \$wall, 53 "wall" => \$wall,
53 "gcc3" => \$gcc3, 54 "gcc3" => \$gcc3,
54 "trace-selection" => \$trace_selection, 55 "trace-selection" => \$trace_selection,
@@ -64,6 +65,7 @@ Build Emacs.
64 65
65 --help show this help 66 --help show this help
66 --all make clean versionclean first 67 --all make clean versionclean first
68 --boot make boostrap, log to boot.log
67 --enable-checking ENABLE_CHECKING=1 (implies Lisp union type) 69 --enable-checking ENABLE_CHECKING=1 (implies Lisp union type)
68 --no-warn disable warnings 70 --no-warn disable warnings
69 --check-marked GC_CHECK_MARKED_OBJECTS=1 71 --check-marked GC_CHECK_MARKED_OBJECTS=1
@@ -168,6 +170,13 @@ $opts = "$opts $warn" if $warn;
168$cc = "/usr/bin/gcc"; 170$cc = "/usr/bin/gcc";
169$cc = "/gd/local/bin/gcc" if $gcc3; 171$cc = "/gd/local/bin/gcc" if $gcc3;
170 172
173if ($boot)
174 {
175 chdir "..";
176 system "mv boot.log boot.log.old" if -f "boot.log";
177 exit system "script boot.log $make CC=\"$cc\" CFLAGS=\"$opts\" bootstrap";
178 }
179
171exit system "$make CC=\"$cc\" CFLAGS=\"$opts\" @ARGV"; 180exit system "$make CC=\"$cc\" CFLAGS=\"$opts\" @ARGV";
172 181
173# Local Variables: 182# Local Variables: