This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH v3] gdbserver: fix the standalone build
- From: Mircea Gherzan <mircea dot gherzan at intel dot com>
- To: yao at codesourcery dot com, tromey at redhat dot com, palves at redhat dot com
- Cc: gdb-patches at sourceware dot org, Mircea Gherzan <mircea dot gherzan at intel dot com>
- Date: Fri, 28 Jun 2013 13:59:31 +0200
- Subject: [PATCH v3] gdbserver: fix the standalone build
When directly invoking gdb/gdbserver/configure && make, the build will
fail because the $(host_alias) is empty and thus create-version.sh does
not get enough parameters.
The output of gdbserver --version without this patch (built like above):
[...]
This gdbserver was configured as ""
After applying this patch:
[...]
This gdbserver was configured as "x86_64-unknown-linux-gnu"
Ok to commit?
2013-06-28 Mircea Gherzan <mircea.gherzan@intel.com>
gdbserver:
* configure.ac (version_host): Add it.
(version_host): Add it.
* configure: Rebuild.
* Makefile.in (version_host): Add it.
(version_target): Add it.
(version.c): Use $(version_host) and $(version_target).
Signed-off-by: Mircea Gherzan <mircea.gherzan@intel.com>
---
gdb/gdbserver/Makefile.in | 4 +++-
gdb/gdbserver/configure | 10 ++++++++++
gdb/gdbserver/configure.ac | 8 ++++++++
3 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in
index e5ecdd3..9053cf8 100644
--- a/gdb/gdbserver/Makefile.in
+++ b/gdb/gdbserver/Makefile.in
@@ -20,6 +20,8 @@ exec_prefix = @exec_prefix@
host_alias = @host_alias@
target_alias = @target_alias@
+version_host = @version_host@
+version_target = @version_target@
program_transform_name = @program_transform_name@
bindir = @bindir@
libdir = @libdir@
@@ -391,7 +393,7 @@ force:
version.c: Makefile $(srcdir)/../common/version.in $(srcdir)/../../bfd/version.h $(srcdir)/../common/create-version.sh
$(SHELL) $(srcdir)/../common/create-version.sh $(srcdir)/.. \
- $(host_alias) $(target_alias) version.c
+ $(version_host) $(version_target) version.c
xml-builtin.c: stamp-xml; @true
stamp-xml: $(XML_DIR)/feature_to_c.sh Makefile $(XML_FILES)
diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure
index b87fedb..0588c94 100755
--- a/gdb/gdbserver/configure
+++ b/gdb/gdbserver/configure
@@ -589,6 +589,8 @@ ac_includes_default="\
#endif"
ac_subst_vars='LTLIBOBJS
+version_target
+version_host
GNULIB_STDINT_H
extra_libraries
IPA_DEPFILES
@@ -5926,6 +5928,14 @@ if test x"$STDINT_H" != x; then
fi
+# For --version, we want to the print --host/--target exactly
+# as passed to configure. But if those were not specified, then
+# print the canonical host/target.
+version_host=${host_alias:-$host}
+version_target=${target_alias:-$target}
+
+
+
ac_config_files="$ac_config_files Makefile"
ac_config_commands="$ac_config_commands default"
diff --git a/gdb/gdbserver/configure.ac b/gdb/gdbserver/configure.ac
index b9928d7..c983d41 100644
--- a/gdb/gdbserver/configure.ac
+++ b/gdb/gdbserver/configure.ac
@@ -471,6 +471,14 @@ if test x"$STDINT_H" != x; then
fi
AC_SUBST(GNULIB_STDINT_H)
+# For --version, we want to the print --host/--target exactly
+# as passed to configure. But if those were not specified, then
+# print the canonical host/target.
+version_host=${host_alias:-$host}
+version_target=${target_alias:-$target}
+AC_SUBST(version_host)
+AC_SUBST(version_target)
+
AC_OUTPUT(Makefile,
[case x$CONFIG_HEADERS in
xconfig.h:config.in)
--
1.7.12.4