build: Use mesar instead of ar.

* scripts/mesar.in: Rename from ar.in.  Update users.
* build-aux/build.sh.in (LIBS): Update.
* build-aux/check.sh.in (recheck): Likwise.
* build-aux/install.sh.in (DESTDIR): Likwise.
* configure (main): Likwise.
* configure.sh (mes_system): Likwise.
* .gitignore: Update.

diff --git a/.gitignore b/.gitignore
index 090230c92e4c6e32fa3891c24a4c3519ec041159..8826fb661b8a3ce969210c322e4884f9cc1db1a8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -147,7 +147,7 @@
 /install.sh
 /uninstall.sh
 /mes/module/mes/boot-0.scm
-/scripts/ar
+/scripts/mesar
 /scripts/mescc.scm
 /scripts/mescc
 /doc/images/gcc-mesboot-graph.png

diff --git a/build-aux/build.sh.in b/build-aux/build.sh.in
index d765f2a5ece0979b4c4aef10a79c42db3ab58caf..148386acf0421f3af5373a47c60a50954e9fc233 100644 (file)
--- a/build-aux/build.sh.in
+++ b/build-aux/build.sh.in
@@ -142,7 +142,7 @@ fi
 -I ${srcdest}include/$mes_kernel/$mes_cpu
 "
     compiler=mescc
-    AR="${srcdest}pre-inst-env ar"
+    AR="${srcdest}pre-inst-env mesar"
     CC="${srcdest}pre-inst-env mescc -m $mes_bits"
     ${SHELL} ${srcdest}build-aux/build-lib.sh
 )

diff --git a/build-aux/check.sh.in b/build-aux/check.sh.in
index 69539cbeb9a2d9fa630be2962da89aadccc77c4d..c01c92f2a01856ef9b106b2612301352f695e125 100644 (file)
--- a/build-aux/check.sh.in
+++ b/build-aux/check.sh.in
@@ -88,7 +88,7 @@ fi
 -nostdlib
 "
     LIBS=-lc
-    AR="${srcdest}pre-inst-env ar"
+    AR="${srcdest}pre-inst-env mesar"
     CC="${srcdest}pre-inst-env mescc"
     ../pre-inst-env ${SHELL} ${srcdest}build-aux/check-mescc.sh
 )

diff --git a/build-aux/install.sh.in b/build-aux/install.sh.in
index 60c581c3dc216379cf5f32f1295046bfc84166d9..ef686d84055080439270074365632ed11be53b0e 100644 (file)
--- a/build-aux/install.sh.in
+++ b/build-aux/install.sh.in
@@ -42,7 +42,7 @@ fi
 DESTDIR=${DESTDIR-}
 mkdir -p ${DESTDIR}${bindir}
 cp $_v src/mes ${DESTDIR}${bindir}/mes
-cp $_v scripts/ar ${DESTDIR}${bindir}/ar
+cp $_v scripts/mesar ${DESTDIR}${bindir}/mesar
 cp $_v scripts/mescc.scm ${DESTDIR}${bindir}/mescc.scm
 cp $_v scripts/mescc ${DESTDIR}${bindir}/mescc
 

diff --git a/configure b/configure
index 4d88bb9b58f37ba44807debf510b8422cf24c113..473622b8350c4cfd57326948b7bc106aa4c74074 100755 (executable)
--- a/configure
+++ b/configure
@@ -631,12 +631,12 @@ See \"Porting GNU Mes\" in the manual, or try --with-courage\n" mes-system)
                     "build-aux/install.sh.in"
                     "build-aux/pre-inst-env.in"
                     "build-aux/uninstall.sh.in"
-                    "scripts/ar.in"
+                    "scripts/mesar.in"
                     "scripts/mescc.scm.in"
                     "scripts/mescc.in"
                     ))
         (chmod "pre-inst-env" #o755)
-        (chmod "scripts/ar" #o755)
+        (chmod "scripts/mesar" #o755)
         (chmod "scripts/mescc" #o755)
         (chmod "scripts/mescc.scm" #o755)
         (chmod "build.sh" #o755)

diff --git a/configure.sh b/configure.sh
index f8ea3acd57d9ae19524dd48f39032cf3b94cd005..271f11f5ef253556a9aa25ae6483ea0daf83011a 100755 (executable)
--- a/configure.sh
+++ b/configure.sh
@@ -248,8 +248,8 @@ subst ${srcdest}build-aux/install.sh.in install.sh
 chmod +x install.sh
 subst ${srcdest}build-aux/pre-inst-env.in pre-inst-env
 chmod +x pre-inst-env
-subst ${srcdest}scripts/ar.in scripts/ar
-chmod +x scripts/ar
+subst ${srcdest}scripts/mesar.in scripts/mesar
+chmod +x scripts/mesar
 subst ${srcdest}scripts/mescc.scm.in scripts/mescc.scm
 chmod +x scripts/mescc.scm
 subst ${srcdest}scripts/mescc.in scripts/mescc

diff --git a/scripts/ar.in b/scripts/ar.in
deleted file mode 100644 (file)
index 979db50..0000000
--- a/scripts/ar.in
+++ /dev/null
@@ -1,37 +0,0 @@
-#! @BASH@
-
-# GNU Mes --- Maxwell Equations of Software
-# Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
-#
-# This file is part of GNU Mes.
-#
-# GNU Mes is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or (at
-# your option) any later version.
-#
-# GNU Mes is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
-
-if [ "$V" = 2 ]; then
-    set -x
-fi
-
-command=$1
-archive=$2
-shift
-shift
-M1_archive=$(dirname "$archive")/$(basename "$archive" .a).s
-declare -a M1_objects
-for o in "$@"; do
-    ((i++))
-    M1_objects[$i]=$(dirname "$o")/$(basename "$o" .o).s
-done
-mkdir -p $(dirname "$archive")
-cat "${M1_objects[@]}" > "$M1_archive"
-cat "$@" > "$archive"

diff --git a/scripts/mesar.in b/scripts/mesar.in
new file mode 100644 (file)
index 0000000..979db50
--- /dev/null
+++ b/scripts/mesar.in
@@ -0,0 +1,37 @@
+#! @BASH@
+
+# GNU Mes --- Maxwell Equations of Software
+# Copyright © 2019 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+#
+# This file is part of GNU Mes.
+#
+# GNU Mes is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or (at
+# your option) any later version.
+#
+# GNU Mes is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Mes.  If not, see <http://www.gnu.org/licenses/>.
+
+if [ "$V" = 2 ]; then
+    set -x
+fi
+
+command=$1
+archive=$2
+shift
+shift
+M1_archive=$(dirname "$archive")/$(basename "$archive" .a).s
+declare -a M1_objects
+for o in "$@"; do
+    ((i++))
+    M1_objects[$i]=$(dirname "$o")/$(basename "$o" .o).s
+done
+mkdir -p $(dirname "$archive")
+cat "${M1_objects[@]}" > "$M1_archive"
+cat "$@" > "$archive"