diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-09-12 13:15:36 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-09-12 13:15:36 +0100 |
| commit | 30c988711cbbd177c8f865347948565583de56db (patch) | |
| tree | 392b26c5b250b349ec45cf564da78ee453895cce /stubdom | |
| parent | 8d701af28f2e5777a5cee19346a60859841459c6 (diff) | |
| download | xen-30c988711cbbd177c8f865347948565583de56db.tar.gz xen-30c988711cbbd177c8f865347948565583de56db.tar.bz2 xen-30c988711cbbd177c8f865347948565583de56db.zip | |
$(XEN_ROOT) absolutification fixes for ioemu-remote (incl stubdom)
* Move code for generating an absolute version of XEN_ROOT
into a common make variable set in Config.mk
* Use this common code when invoking make -C ioemu-dir clean
from tools/, which avoids a problem where `make clean' fails
because qemu's (ioemu-remote's) build system wants to run
`make clean' in `tests' but XEN_ROOT is a confection involving
../'s.
* Use this common code in stubdom/Makefile, instead of $(abspath...)
as the latter is a relatively new feature in GNU make and is not
available in all the places that we want to be able to build
(cf c/s 17997:3f23e01d31985899dbd1660b166f229f1ee74292)
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'stubdom')
| -rw-r--r-- | stubdom/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/stubdom/Makefile b/stubdom/Makefile index 74112c9b92..9bab6b4036 100644 --- a/stubdom/Makefile +++ b/stubdom/Makefile @@ -232,8 +232,9 @@ ifeq ($(CONFIG_QEMU),ioemu) CPPFLAGS="$(TARGET_CPPFLAGS)" $(MAKE) -C ioemu LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) TOOLS= else [ -f ioemu/config-host.mak ] || \ - ( cd ioemu ; \ - CONFIG_STUBDOM=yes XEN_ROOT=$(abspath $(XEN_ROOT)) XEN_TARGET_ARCH=$(XEN_TARGET_ARCH) CFLAGS="$(TARGET_CFLAGS)" sh ./xen-setup --cc=$(CC) --disable-gcc-check $(IOEMU_OPTIONS)) + ( $(absolutify_xen_root); \ + cd ioemu ; \ + CONFIG_STUBDOM=yes XEN_TARGET_ARCH=$(XEN_TARGET_ARCH) CFLAGS="$(TARGET_CFLAGS)" sh ./xen-setup --cc=$(CC) --disable-gcc-check $(IOEMU_OPTIONS)) CPPFLAGS= TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" $(MAKE) -C ioemu LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) TOOLS= CONFIG_STUBDOM=yes endif |