diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2021-06-08 18:04:28 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2021-06-14 18:01:20 -0400 |
| commit | 483ab96a1bd6df30035dc2ae1a90b1b59c54ef75 (patch) | |
| tree | 6caabc894a85765a3cd961a28fc0c635aa462e05 /sim/common | |
| parent | 09db4332c6017ab57cd136788c48e5a81e3b9399 (diff) | |
| download | gdb-483ab96a1bd6df30035dc2ae1a90b1b59c54ef75.zip gdb-483ab96a1bd6df30035dc2ae1a90b1b59c54ef75.tar.gz gdb-483ab96a1bd6df30035dc2ae1a90b1b59c54ef75.tar.bz2 | |
gnulib: define the path to gnulib's parent dir
The current setting assumes that gnulib is only used by dirs
immediately under the source root. Trying to build it two or
more levels deep fails. Switch GNULIB_BUILDDIR to a relative
GNULIB_PARENT_DIR so that it can be used to construct both the
build & source paths.
Diffstat (limited to 'sim/common')
| -rw-r--r-- | sim/common/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/common/Make-common.in | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 8f44658..5bf47a3 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,8 @@ +2021-06-14 Mike Frysinger <vapier@gentoo.org> + + * Make-common.in (GNULIB_BUILDDIR): Rename to ... + (GNULIB_PARENT_DIR): ... this. Remove "gnulib" from value. + 2021-06-12 Mike Frysinger <vapier@gentoo.org> * Make-common.in (COMMON_OBJS_NAMES): Add portability.o. diff --git a/sim/common/Make-common.in b/sim/common/Make-common.in index 7a5bbc1..3dab9ca 100644 --- a/sim/common/Make-common.in +++ b/sim/common/Make-common.in @@ -41,8 +41,8 @@ srcroot = $(srcdir)/../.. srcsim = $(srcdir)/.. # Helper code from gnulib. -GNULIB_BUILDDIR = ../../gnulib -include $(GNULIB_BUILDDIR)/Makefile.gnulib.inc +GNULIB_PARENT_DIR = ../.. +include $(GNULIB_PARENT_DIR)/gnulib/Makefile.gnulib.inc prefix = @prefix@ exec_prefix = @exec_prefix@ |