diff options
| author | Mircea Gherzan <mgherzan@sourceware.org> | 2013-06-28 12:29:15 +0000 |
|---|---|---|
| committer | Mircea Gherzan <mgherzan@sourceware.org> | 2013-06-28 12:29:15 +0000 |
| commit | 257b6bec774c0b9ec2c52494fc4898f472fcdbb8 (patch) | |
| tree | 19881a927174538766ec624f9332c8df705cda1a | |
| parent | c3b6407fbe23dd386b8aee88a45fb3dd718fe2ea (diff) | |
| download | gdb-257b6bec774c0b9ec2c52494fc4898f472fcdbb8.zip gdb-257b6bec774c0b9ec2c52494fc4898f472fcdbb8.tar.gz gdb-257b6bec774c0b9ec2c52494fc4898f472fcdbb8.tar.bz2 | |
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"
2013-06-28 Mircea Gherzan <mircea.gherzan@intel.com>
gdbserver:
* configure.ac (version_host, version_target): Set and AC_SUBST
them.
* configure: Rebuild.
* Makefile.in (version_host, version_target): Get from
configure.
(version.c): Use $(version_host) and $(version_target).
Change-Id: Id48240532ad3d624ec78867a6db5ebd4c09583ff
Signed-off-by: Mircea Gherzan <mircea.gherzan@intel.com>
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/gdbserver/Makefile.in | 4 | ||||
| -rwxr-xr-x | gdb/gdbserver/configure | 10 | ||||
| -rw-r--r-- | gdb/gdbserver/configure.ac | 8 |
4 files changed, 28 insertions, 1 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 781f910..b515af4 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,10 @@ +2013-06-28 Mircea Gherzan <mircea.gherzan@intel.com> + + * configure.ac (version_host, version_target): Set and AC_SUBST them. + * configure: Rebuild. + * Makefile.in (version_host, version_target): Get from configure. + (version.c): Use $(version_host) and $(version_target). + 2013-06-10 Dmitry Kozlov <ddk@codesourcery.com> Fix trace-status to output user name without trailing colon. 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) |