[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Bootstrap failure on MS-Windows
From: |
Dani Moncayo |
Subject: |
Re: Bootstrap failure on MS-Windows |
Date: |
Wed, 6 Nov 2013 16:38:26 +0100 |
> So this is the final patch that has worked for me:
I want to suggest the following simplification/improvement. It is
tested on a real bootstrap.
Explanation:
* The ouput of "pwd -W" is in windows-native format (c:/foo/bar), and
we are converting it to MSYS-format (/c/foo/bar) and then converting
it back to windows-native format. That double conversion is obviously
pointless.
* "${srcdir}" should expand to an existing directory. If somehow it
expands to anything else, it is better to error out, because something
is going wrong. So I've chained the commands with "&&" instead of
";".
diff --git a/Makefile.in b/Makefile.in
index 984dcea..3de8209 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -351,7 +351,7 @@ msys_sed_sh_escape=sed -e 's/[];$$*.^[]/\\\\&/g'
# the data directory. "pwd -W" produces Windows-style 'd:/foo/bar'
# absolute directory names, so we use it here to countermand that lossage.
epaths-force-w32: FRC
- @(w32srcdir=`cd "${srcdir}"; pwd -W | sed -e 's,^\([A-Za-z]\):,/\1,'
| ${msys_to_w32}` ; \
+ @(w32srcdir=`cd "${srcdir}" && pwd -W` ; \
prefixpattern=`echo '${prefix}' | ${msys_to_w32} | ${msys_sed_sh_escape}` ; \
locallisppath=`echo '${locallisppath}' | ${msys_lisppath_to_w32} |
${msys_prefix_subst}` ; \
sed < ${srcdir}/nt/epaths.nt > epaths.h.$$$$ \
--
Dani Moncayo
- Bootstrap failure on MS-Windows, Dani Moncayo, 2013/11/02
- Re: Bootstrap failure on MS-Windows, Glenn Morris, 2013/11/02
- Re: Bootstrap failure on MS-Windows, Glenn Morris, 2013/11/05
- Re: Bootstrap failure on MS-Windows, Dani Moncayo, 2013/11/05
- Re: Bootstrap failure on MS-Windows, Eli Zaretskii, 2013/11/05
- Re: Bootstrap failure on MS-Windows, Dani Moncayo, 2013/11/05
- Re: Bootstrap failure on MS-Windows, Eli Zaretskii, 2013/11/05
- Re: Bootstrap failure on MS-Windows, Dani Moncayo, 2013/11/05
- Re: Bootstrap failure on MS-Windows, Glenn Morris, 2013/11/05
- Re: Bootstrap failure on MS-Windows,
Dani Moncayo <=
- Re: Bootstrap failure on MS-Windows, Glenn Morris, 2013/11/06
- Re: Bootstrap failure on MS-Windows, Eli Zaretskii, 2013/11/06
- Re: Bootstrap failure on MS-Windows, Glenn Morris, 2013/11/06
- Re: Bootstrap failure on MS-Windows, Glenn Morris, 2013/11/11
- Re: Bootstrap failure on MS-Windows, Óscar Fuentes, 2013/11/05
- Re: Bootstrap failure on MS-Windows, Glenn Morris, 2013/11/05
- Re: Bootstrap failure on MS-Windows, Glenn Morris, 2013/11/05
- Re: Bootstrap failure on MS-Windows, Andy Moreton, 2013/11/06
- Re: Bootstrap failure on MS-Windows, Eli Zaretskii, 2013/11/06
- Re: Bootstrap failure on MS-Windows, Andy Moreton, 2013/11/06