artemist/mes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

build: Use mesar instead of ar.

Browse source 
* 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.
This commit is contained in:
Jan Nieuwenhuizen 2019-07-21 16:44:54 +02:00
parent 3bed314d94
commit 2cc6d5a012
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
7 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -147,7 +147,7 @@
/install.sh /install.sh
/uninstall.sh /uninstall.sh
/mes/module/mes/boot-0.scm /mes/module/mes/boot-0.scm
/scripts/ar /scripts/mesar
/scripts/mescc.scm /scripts/mescc.scm
/scripts/mescc /scripts/mescc
/doc/images/gcc-mesboot-graph.png /doc/images/gcc-mesboot-graph.png

2
build-aux/build.sh.in
View file

@ -142,7 +142,7 @@ fi
-I ${srcdest}include/$mes_kernel/$mes_cpu -I ${srcdest}include/$mes_kernel/$mes_cpu
" "
compiler=mescc compiler=mescc
AR="${srcdest}pre-inst-env ar" AR="${srcdest}pre-inst-env mesar"
CC="${srcdest}pre-inst-env mescc -m $mes_bits" CC="${srcdest}pre-inst-env mescc -m $mes_bits"
${SHELL} ${srcdest}build-aux/build-lib.sh ${SHELL} ${srcdest}build-aux/build-lib.sh
) )

2
build-aux/check.sh.in
View file

@ -88,7 +88,7 @@ fi
-nostdlib -nostdlib
" "
LIBS=-lc LIBS=-lc
AR="${srcdest}pre-inst-env ar" AR="${srcdest}pre-inst-env mesar"
CC="${srcdest}pre-inst-env mescc" CC="${srcdest}pre-inst-env mescc"
../pre-inst-env ${SHELL} ${srcdest}build-aux/check-mescc.sh ../pre-inst-env ${SHELL} ${srcdest}build-aux/check-mescc.sh
) )

2
build-aux/install.sh.in
View file

@ -42,7 +42,7 @@ fi
DESTDIR=${DESTDIR-} DESTDIR=${DESTDIR-}
mkdir -p ${DESTDIR}${bindir} mkdir -p ${DESTDIR}${bindir}
cp $_v src/mes ${DESTDIR}${bindir}/mes 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.scm ${DESTDIR}${bindir}/mescc.scm
cp $_v scripts/mescc ${DESTDIR}${bindir}/mescc cp $_v scripts/mescc ${DESTDIR}${bindir}/mescc

4
configure vendored
View file

@ -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/install.sh.in"
"build-aux/pre-inst-env.in" "build-aux/pre-inst-env.in"
"build-aux/uninstall.sh.in" "build-aux/uninstall.sh.in"
"scripts/ar.in" "scripts/mesar.in"
"scripts/mescc.scm.in" "scripts/mescc.scm.in"
"scripts/mescc.in" "scripts/mescc.in"
)) ))
(chmod "pre-inst-env" #o755) (chmod "pre-inst-env" #o755)
(chmod "scripts/ar" #o755) (chmod "scripts/mesar" #o755)
(chmod "scripts/mescc" #o755) (chmod "scripts/mescc" #o755)
(chmod "scripts/mescc.scm" #o755) (chmod "scripts/mescc.scm" #o755)
(chmod "build.sh" #o755) (chmod "build.sh" #o755)

4
configure.sh
View file

@ -248,8 +248,8 @@ subst ${srcdest}build-aux/install.sh.in install.sh
chmod +x install.sh chmod +x install.sh
subst ${srcdest}build-aux/pre-inst-env.in pre-inst-env subst ${srcdest}build-aux/pre-inst-env.in pre-inst-env
chmod +x pre-inst-env chmod +x pre-inst-env
subst ${srcdest}scripts/ar.in scripts/ar subst ${srcdest}scripts/mesar.in scripts/mesar
chmod +x scripts/ar chmod +x scripts/mesar
subst ${srcdest}scripts/mescc.scm.in scripts/mescc.scm subst ${srcdest}scripts/mescc.scm.in scripts/mescc.scm
chmod +x scripts/mescc.scm chmod +x scripts/mescc.scm
subst ${srcdest}scripts/mescc.in scripts/mescc subst ${srcdest}scripts/mescc.in scripts/mescc

0
scripts/ar.in → scripts/mesar.in
View file