Fix non-installed compilation

PATCH In review Samuel Thibault 2 participants 2 messages Jan 28, 2008

Share & tools

Samuel Thibault

author

2008-01-28 18:26 UTC #0 lore raw

PATCH 1/1 Fix non-installed compilation

Some headers got moved from tools/libxc/ to tools/include/ This is needed to compile on machines which don't have Xen installed yet.

Signed-off-by Samuel Thibault <[email protected]>

tools/firmware/hvmloader/Makefile +1 -1

diff -r a763b70405fa tools/firmware/hvmloader/Makefile
@@ -20,7 +20,7 @@
 
 override XEN_TARGET_ARCH = x86_32
 XEN_ROOT = ../../..
-CFLAGS := -I$(XEN_ROOT)/tools/libxc -I.
+CFLAGS := -I$(XEN_ROOT)/tools/include -I$(XEN_ROOT)/tools/libxc -I.
 include $(XEN_ROOT)/tools/Rules.mk
 
 # The HVM loader is started in 32-bit mode at the address below:

tools/firmware/hvmloader/acpi/Makefile +1 -1

diff -r a763b70405fa tools/firmware/hvmloader/acpi/Makefile
@@ -17,7 +17,7 @@
 
 override XEN_TARGET_ARCH = x86_32
 XEN_ROOT = ../../../..
-CFLAGS := -I. -I.. -I$(XEN_ROOT)/tools/libxc
+CFLAGS := -I. -I.. -I$(XEN_ROOT)/tools/include
 include $(XEN_ROOT)/tools/Rules.mk
 
 C_SRC = build.c dsdt.c static_tables.c

tools/firmware/vmxassist/Makefile +1 -1

diff -r a763b70405fa tools/firmware/vmxassist/Makefile
@@ -29,7 +29,7 @@ TEXTADDR=0x000D0000
 TEXTADDR=0x000D0000
 
 DEFINES=-DDEBUG -DTEXTADDR=$(TEXTADDR)
-XENINC=-I$(XEN_ROOT)/tools/libxc
+XENINC=-I$(XEN_ROOT)/tools/include
 
 # Disable PIE/SSP if GCC supports them. They can break us.
 CFLAGS  += $(call cc-option,$(CC),-nopie,)

Keir Fraser

2008-01-28 18:31 UTC #1 lore raw

Should be fixed by c/s 16923.

-- Keir

Quoted 47 lines · Samuel Thibault

Some headers got moved from tools/libxc/ to tools/include/ This is needed to compile on machines which don't have Xen installed yet.
Signed-off-by Samuel Thibault <[email protected]>
diff -r a763b70405fa tools/firmware/hvmloader/Makefile
tools/firmware/hvmloader/Makefile Mon Jan 28 18:23:09 2008 +0000 renamed from tools/firmware/hvmloader/Makefile Mon Jan 28 13:26:30 2008 +0000 +1 -1
@@ -20,7 +20,7 @@
 
 override XEN_TARGET_ARCH = x86_32
 XEN_ROOT = ../../..
-CFLAGS := -I$(XEN_ROOT)/tools/libxc -I.
+CFLAGS := -I$(XEN_ROOT)/tools/include -I$(XEN_ROOT)/tools/libxc -I.
 include $(XEN_ROOT)/tools/Rules.mk
 
 # The HVM loader is started in 32-bit mode at the address below:
diff -r a763b70405fa tools/firmware/hvmloader/acpi/Makefile
tools/firmware/hvmloader/acpi/Makefile Mon Jan 28 18:23:09 2008 +0000 renamed from tools/firmware/hvmloader/acpi/Makefile Mon Jan 28 13:26:30 2008 +0000 +1 -1
@@ -17,7 +17,7 @@
 
 override XEN_TARGET_ARCH = x86_32
 XEN_ROOT = ../../../..
-CFLAGS := -I. -I.. -I$(XEN_ROOT)/tools/libxc
+CFLAGS := -I. -I.. -I$(XEN_ROOT)/tools/include
 include $(XEN_ROOT)/tools/Rules.mk
 
 C_SRC = build.c dsdt.c static_tables.c
diff -r a763b70405fa tools/firmware/vmxassist/Makefile
tools/firmware/vmxassist/Makefile Mon Jan 28 18:23:09 2008 +0000 renamed from tools/firmware/vmxassist/Makefile Mon Jan 28 13:26:30 2008 +0000 +1 -1
@@ -29,7 +29,7 @@ TEXTADDR=0x000D0000
 TEXTADDR=0x000D0000
 
 DEFINES=-DDEBUG -DTEXTADDR=$(TEXTADDR)
-XENINC=-I$(XEN_ROOT)/tools/libxc
+XENINC=-I$(XEN_ROOT)/tools/include
 
 # Disable PIE/SSP if GCC supports them. They can break us.
 CFLAGS  += $(call cc-option,$(CC),-nopie,)
_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel