This is the mail archive of the gdb-patches@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[commit] Fix host_name and target_name generation by common/create-version.sh.


Hello,

there was a small snafoo in this new script, which prevented the $host_alias
and $target_alias from being expanded during the generation of the
version.c file.  As a result, the version info yields:

    This GDB was configured as "--host=$host_alias --target=$target_alias".
                                       ^^^^^^^^^^^          ^^^^^^^^^^^^^

This patch fixes this issue.

gdb/ChangeLog:

        * common/create-version.sh: Fix expansion of $host_alias
        and $target_alias in generation of HOST_NAME and TARGET_NAME
        (resp.).

Tested by rebuilding GDB native and cross on x86_64-linux.
Checked in.

---
 gdb/ChangeLog                |    6 ++++++
 gdb/common/create-version.sh |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0b81e33..adaf463 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2013-06-24  Joel Brobecker  <brobecker@adacore.com>
+
+	* common/create-version.sh: Fix expansion of $host_alias
+	and $target_alias in generation of HOST_NAME and TARGET_NAME
+	(resp.).
+
 2013-06-24  Tom Tromey  <tromey@redhat.com>
 
 	* common/create-version.sh: New file.
diff --git a/gdb/common/create-version.sh b/gdb/common/create-version.sh
index 2d2bc74..56871bf 100755
--- a/gdb/common/create-version.sh
+++ b/gdb/common/create-version.sh
@@ -32,7 +32,7 @@ date=`sed -n -e 's/^.* BFD_VERSION_DATE \(.*\)$$/\1/p' $srcdir/../bfd/version.h`
 sed -e "s/DATE/$date/" < $srcdir/common/version.in > version.tmp
 echo '#include "version.h"' >> version.c-tmp
 echo 'const char version[] = "'"`sed q version.tmp`"'";' >> version.c-tmp
-echo 'const char host_name[] = "$host_alias";' >> version.c-tmp
-echo 'const char target_name[] = "$target_alias";' >> version.c-tmp
+echo 'const char host_name[] = "'"$host_alias"'";' >> version.c-tmp
+echo 'const char target_name[] = "'"$target_alias"'";' >> version.c-tmp
 mv version.c-tmp $output
 rm -f version.tmp
-- 
1.7.10.4


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]