diff options
| author | Keir Fraser <keir@xen.org> | 2011-10-06 19:47:14 +0100 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2011-10-06 19:47:14 +0100 |
| commit | 7297daddfa6a2aeb72b08e544836895f2a33aaa7 (patch) | |
| tree | 92ed841b86a6beebd68cdf11509d05d0a0808809 /extras/mini-os | |
| parent | c57e5e842d1e1210777a4e0b1a16b9b710e7dbe1 (diff) | |
| download | xen-7297daddfa6a2aeb72b08e544836895f2a33aaa7.tar.gz xen-7297daddfa6a2aeb72b08e544836895f2a33aaa7.tar.bz2 xen-7297daddfa6a2aeb72b08e544836895f2a33aaa7.zip | |
build: Make XEN_ROOT an absolute path.
Otherwise make can search the path relative to certain standard paths
such as /usr/include (e.g., the line '-include $(XEN_ROOT)/.config' in
Config.mk suffers from this).
Signed-off-by: Keir Fraser <keir@xen.org>
xen-unstable changeset: 23049:ff3b7749008b
Backport-requested-by: Allen M Kay <allen.m.kay@intel.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Diffstat (limited to 'extras/mini-os')
| -rw-r--r-- | extras/mini-os/Config.mk | 8 | ||||
| -rw-r--r-- | extras/mini-os/Makefile | 2 | ||||
| -rw-r--r-- | extras/mini-os/arch/ia64/Makefile | 2 | ||||
| -rw-r--r-- | extras/mini-os/arch/x86/Makefile | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/extras/mini-os/Config.mk b/extras/mini-os/Config.mk index a1a2283ecc..806d4ff8fd 100644 --- a/extras/mini-os/Config.mk +++ b/extras/mini-os/Config.mk @@ -38,15 +38,15 @@ EXTRA_INC = $(ARCH_INC) # This must be before include minios.mk! include $(MINI-OS_ROOT)/$(TARGET_ARCH_DIR)/arch.mk -extra_incl := $(foreach dir,$(EXTRA_INC),-isystem $(CURDIR)/$(MINI-OS_ROOT)/include/$(dir)) +extra_incl := $(foreach dir,$(EXTRA_INC),-isystem $(MINI-OS_ROOT)/include/$(dir)) -DEF_CPPFLAGS += -isystem $(CURDIR)/$(MINI-OS_ROOT)/include +DEF_CPPFLAGS += -isystem $(MINI-OS_ROOT)/include DEF_CPPFLAGS += -D__MINIOS__ ifeq ($(libc),y) DEF_CPPFLAGS += -DHAVE_LIBC -DEF_CPPFLAGS += -isystem $(CURDIR)/$(MINI-OS_ROOT)/include/posix -DEF_CPPFLAGS += -isystem $(CURDIR)/$(XEN_ROOT)/tools/xenstore +DEF_CPPFLAGS += -isystem $(MINI-OS_ROOT)/include/posix +DEF_CPPFLAGS += -isystem $(XEN_ROOT)/tools/xenstore endif ifneq ($(LWIPDIR),) diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile index 78e0c9d527..c2ee062266 100644 --- a/extras/mini-os/Makefile +++ b/extras/mini-os/Makefile @@ -4,7 +4,7 @@ # Makefile and a arch.mk. # -export XEN_ROOT = ../.. +export XEN_ROOT = $(CURDIR)/../.. include $(XEN_ROOT)/Config.mk OBJ_DIR ?= $(CURDIR) diff --git a/extras/mini-os/arch/ia64/Makefile b/extras/mini-os/arch/ia64/Makefile index 405066215d..ca3120e10e 100644 --- a/extras/mini-os/arch/ia64/Makefile +++ b/extras/mini-os/arch/ia64/Makefile @@ -2,7 +2,7 @@ # Special makefile for ia64. # -XEN_ROOT = ../../../.. +XEN_ROOT = $(CURDIR)/../../../.. include $(XEN_ROOT)/Config.mk include ../../Config.mk diff --git a/extras/mini-os/arch/x86/Makefile b/extras/mini-os/arch/x86/Makefile index 3c5fb6ae78..1073e36267 100644 --- a/extras/mini-os/arch/x86/Makefile +++ b/extras/mini-os/arch/x86/Makefile @@ -3,7 +3,7 @@ # It's is used for x86_32, x86_32y and x86_64 # -XEN_ROOT = ../../../.. +XEN_ROOT = $(CURDIR)/../../../.. include $(XEN_ROOT)/Config.mk include ../../Config.mk |