ld: yet another PDB build fix (or workaround)
Older bash looks to improperly deal with backslashes in here-documents, leaving them in place on the escaped double quotes inside the parameter expansion. Convert to a model without using such a construct, by simply splitting the here-documents into three ones.
This commit is contained in:
+12
-8
@@ -15,13 +15,6 @@ case ${target} in
|
||||
;;
|
||||
esac
|
||||
|
||||
case ${target} in
|
||||
x86_64-*-mingw* | x86_64-*-pe | x86_64-*-pep | x86_64-*-cygwin | \
|
||||
i[3-7]86-*-mingw32* | i[3-7]86-*-cygwin* | i[3-7]86-*-winnt | i[3-7]86-*-pe)
|
||||
pdb_support=" ";;
|
||||
*)
|
||||
esac
|
||||
|
||||
rm -f e${EMULATION_NAME}.c
|
||||
(echo;echo;echo;echo;echo)>e${EMULATION_NAME}.c # there, now line numbers match ;-)
|
||||
fragment <<EOF
|
||||
@@ -73,7 +66,18 @@ fragment <<EOF
|
||||
#include "ldctor.h"
|
||||
#include "ldbuildid.h"
|
||||
#include "coff/internal.h"
|
||||
${pdb_support+#include \"pdb.h\"}
|
||||
EOF
|
||||
|
||||
case ${target} in
|
||||
x86_64-*-mingw* | x86_64-*-pe | x86_64-*-pep | x86_64-*-cygwin | \
|
||||
i[3-7]86-*-mingw32* | i[3-7]86-*-cygwin* | i[3-7]86-*-winnt | i[3-7]86-*-pe)
|
||||
fragment <<EOF
|
||||
#include "pdb.h"
|
||||
EOF
|
||||
;;
|
||||
esac
|
||||
|
||||
fragment <<EOF
|
||||
|
||||
/* FIXME: See bfd/peXXigen.c for why we include an architecture specific
|
||||
header in generic PE code. */
|
||||
|
||||
+12
-8
@@ -17,13 +17,6 @@ case ${target} in
|
||||
;;
|
||||
esac
|
||||
|
||||
case ${target} in
|
||||
x86_64-*-mingw* | x86_64-*-pe | x86_64-*-pep | x86_64-*-cygwin | \
|
||||
i[3-7]86-*-mingw32* | i[3-7]86-*-cygwin* | i[3-7]86-*-winnt | i[3-7]86-*-pe)
|
||||
pdb_support=" ";;
|
||||
*)
|
||||
esac
|
||||
|
||||
rm -f e${EMULATION_NAME}.c
|
||||
(echo;echo;echo;echo;echo)>e${EMULATION_NAME}.c # there, now line numbers match ;-)
|
||||
fragment <<EOF
|
||||
@@ -82,7 +75,18 @@ fragment <<EOF
|
||||
#include "ldctor.h"
|
||||
#include "ldbuildid.h"
|
||||
#include "coff/internal.h"
|
||||
${pdb_support+#include \"pdb.h\"}
|
||||
EOF
|
||||
|
||||
case ${target} in
|
||||
x86_64-*-mingw* | x86_64-*-pe | x86_64-*-pep | x86_64-*-cygwin | \
|
||||
i[3-7]86-*-mingw32* | i[3-7]86-*-cygwin* | i[3-7]86-*-winnt | i[3-7]86-*-pe)
|
||||
fragment <<EOF
|
||||
#include "pdb.h"
|
||||
EOF
|
||||
;;
|
||||
esac
|
||||
|
||||
fragment <<EOF
|
||||
|
||||
/* FIXME: See bfd/peXXigen.c for why we include an architecture specific
|
||||
header in generic PE code. */
|
||||
|
||||
Reference in New Issue
Block a user