File tree Expand file tree Collapse file tree 3 files changed +9
-9
lines changed Expand file tree Collapse file tree 3 files changed +9
-9
lines changed Original file line number Diff line number Diff line change @@ -53,12 +53,12 @@ endif
53
53
# its tools and libraries in different folders. The next couple of
54
54
# variables will determine and set the right path for both the
55
55
# tools $(GNUEFI_DIR) and libraries $(LIBDIR)
56
- GNUEFI_DIR := $(shell find /usr/lib* -name elf_$(ARCH ) _efi.lds -type f | xargs dirname)
56
+ GNUEFI_DIR := $(shell find $( SYSROOT ) /usr/lib* -name elf_$(ARCH ) _efi.lds -type f | xargs dirname)
57
57
LIBDIR := $(subst gnuefi,,$(GNUEFI_DIR ) )
58
58
CRT0 := $(GNUEFI_DIR ) /crt0-efi-$(ARCH ) .o
59
59
LDSCRIPT := $(GNUEFI_DIR ) /elf_$(ARCH ) _efi.lds
60
60
61
- INCDIR := /usr/include
61
+ INCDIR := $( SYSROOT ) /usr/include
62
62
63
63
CFLAGS =-I. -I.. -I../../../include/arch/x86/guest -I$(INCDIR ) /efi -I$(INCDIR ) /efi/$(ARCH ) \
64
64
-DEFI_FUNCTION_WRAPPER -fPIC -fshort-wchar -ffreestanding \
Original file line number Diff line number Diff line change @@ -54,12 +54,12 @@ export BUILDDIR
54
54
export CC
55
55
export RM
56
56
57
- PKG_CONFIG_PATH := $(PKG_CONFIG_PATH ) :/usr/lib/pkgconfig
58
- PKG_CONFIG_PATH := $(PKG_CONFIG_PATH ) :/usr/share/pkgconfig
59
- PKG_CONFIG_PATH := $(PKG_CONFIG_PATH ) :/usr/local/lib/pkgconfig
60
- PKG_CONFIG_PATH := $(PKG_CONFIG_PATH ) :/usr/local/share/pkgconfig
61
- PKG_CONFIG_PATH := $(PKG_CONFIG_PATH ) :/usr/lib32/pkgconfig
62
- PKG_CONFIG_PATH := $(PKG_CONFIG_PATH ) :/usr/lib64/pkgconfig
57
+ PKG_CONFIG_PATH := $(PKG_CONFIG_PATH ) :$( SYSROOT ) /usr/lib/pkgconfig
58
+ PKG_CONFIG_PATH := $(PKG_CONFIG_PATH ) :$( SYSROOT ) /usr/share/pkgconfig
59
+ PKG_CONFIG_PATH := $(PKG_CONFIG_PATH ) :$( SYSROOT ) /usr/local/lib/pkgconfig
60
+ PKG_CONFIG_PATH := $(PKG_CONFIG_PATH ) :$( SYSROOT ) /usr/local/share/pkgconfig
61
+ PKG_CONFIG_PATH := $(PKG_CONFIG_PATH ) :$( SYSROOT ) /usr/lib32/pkgconfig
62
+ PKG_CONFIG_PATH := $(PKG_CONFIG_PATH ) :$( SYSROOT ) /usr/lib64/pkgconfig
63
63
64
64
EXTRA_LIBS = -lsystemd-journal
65
65
PKG_CONFIG := $(shell export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH ) ; \
Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ VERSION_H = $(BUILDDIR)/include/acrnprobe/version.h
5
5
6
6
LIBS = -lpthread -lxml2 -lcrypto -lrt -lblkid -lext2fs -lcom_err \
7
7
$(EXTRA_LIBS )
8
- INCLUDE += -I $(CURDIR ) /include -I /usr/include/libxml2
8
+ INCLUDE += -I $(CURDIR ) /include -I $( SYSROOT ) /usr/include/libxml2
9
9
INCLUDE += -I $(BUILDDIR ) /include/acrnprobe
10
10
CFLAGS += $(INCLUDE )
11
11
CFLAGS += -fdata-sections
You can’t perform that action at this time.
0 commit comments