Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Makefile: Pass down the variable EFI_BUILD
This variable indicates whether or nor the files are compiled for EFI.
The lack of it lead the Makefiles to forget to add some compilation
options specific to EFI.

Signed-off-by: Sylvain Gault <sylvain.gault@gmail.com>
  • Loading branch information
Sylvain Gault committed Nov 27, 2015
1 parent 82c0ec7 commit 2d14923
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 13 deletions.
17 changes: 9 additions & 8 deletions Makefile
Expand Up @@ -102,7 +102,8 @@ endif
.PHONY: $(filter-out $(private-targets), $(MAKECMDGOALS))
$(filter-out $(private-targets), $(MAKECMDGOALS)):
$(MAKE) -C $(OBJDIR) -f $(CURDIR)/Makefile SRC="$(topdir)" \
OBJ=$(OBJDIR) objdir=$(OBJDIR) $(MAKECMDGOALS)
OBJ=$(OBJDIR) objdir=$(OBJDIR) EFI_BUILD=$(EFI_BUILD) \
$(MAKECMDGOALS)

unittest:
printf "Executing unit tests\n"
Expand All @@ -111,7 +112,7 @@ unittest:

regression:
$(MAKE) -C tests SRC="$(topdir)/tests" OBJ="$(topdir)/tests" \
objdir=$(OBJDIR) \
objdir=$(OBJDIR) EFI_BUILD=$(EFI_BUILD) \
-f $(topdir)/tests/Makefile all

test: unittest regression
Expand Down Expand Up @@ -284,17 +285,17 @@ subdirs: $(BSUBDIRS) $(ISUBDIRS)

$(sort $(ISUBDIRS) $(BSUBDIRS)):
@mkdir -p $@
$(MAKE) -C $@ SRC="$(SRC)/$@" OBJ="$(OBJ)/$@" \
$(MAKE) -C $@ SRC="$(SRC)/$@" OBJ="$(OBJ)/$@" EFI_BUILD=$(EFI_BUILD) \
-f $(SRC)/$@/Makefile $(MAKECMDGOALS)

$(ITARGET):
@mkdir -p $@
$(MAKE) -C $@ SRC="$(SRC)/$@" OBJ="$(OBJ)/$@" \
$(MAKE) -C $@ SRC="$(SRC)/$@" OBJ="$(OBJ)/$@" EFI_BUILD=$(EFI_BUILD) \
-f $(SRC)/$@/Makefile $(MAKECMDGOALS)

$(BINFILES):
@mkdir -p $@
$(MAKE) -C $@ SRC="$(SRC)/$@" OBJ="$(OBJ)/$@" \
$(MAKE) -C $@ SRC="$(SRC)/$@" OBJ="$(OBJ)/$@" EFI_BUILD=$(EFI_BUILD) \
-f $(SRC)/$@/Makefile $(MAKECMDGOALS)

#
Expand All @@ -309,15 +310,15 @@ gpxe: core
installer: installer-local
set -e; for i in $(ISUBDIRS); \
do $(MAKE) -C $$i SRC="$(SRC)/$$i" OBJ="$(OBJ)/$$i" \
-f $(SRC)/$$i/Makefile all; done
EFI_BUILD=$(EFI_BUILD) -f $(SRC)/$$i/Makefile all; done


installer-local: $(ITARGET) $(BINFILES)

strip: strip-local
set -e; for i in $(ISUBDIRS); \
do $(MAKE) -C $$i SRC="$(SRC)/$$i" OBJ="$(OBJ)/$$i" \
-f $(SRC)/$$i/Makefile strip; done
EFI_BUILD=$(EFI_BUILD) -f $(SRC)/$$i/Makefile strip; done
-ls -l $(BOBJECTS) $(IOBJECTS)

strip-local:
Expand Down Expand Up @@ -355,7 +356,7 @@ install:
set -e ; for i in $(INSTALLSUBDIRS) ; \
do $(MAKE) -C $$i SRC="$(SRC)/$$i" OBJ="$(OBJ)/$$i" \
BITS="$(BITS)" AUXDIR="$(AUXDIR)/efi$(BITS)" \
-f $(SRC)/$$i/Makefile $@; done
EFI_BUILD=$(EFI_BUILD) -f $(SRC)/$$i/Makefile $@; done
-install -m 644 $(INSTALLABLE_MODULES) $(INSTALLROOT)$(AUXDIR)/efi$(BITS)
install -m 644 com32/elflink/ldlinux/$(LDLINUX) $(INSTALLROOT)$(AUXDIR)/efi$(BITS)
endif
Expand Down
2 changes: 1 addition & 1 deletion com32/Makefile
Expand Up @@ -6,7 +6,7 @@ subdirs: $(SUBDIRS)
$(SUBDIRS):
@mkdir -p $(OBJ)/$@
$(MAKE) -C $(OBJ)/$@ SRC="$(SRC)"/$@ OBJ="$(OBJ)"/$@/ \
-f $(SRC)/$@/Makefile $(MAKECMDGOALS)
EFI_BUILD=$(EFI_BUILD) -f $(SRC)/$@/Makefile $(MAKECMDGOALS)

all tidy dist clean spotless install: subdirs

Expand Down
2 changes: 1 addition & 1 deletion diag/Makefile
Expand Up @@ -4,4 +4,4 @@ all tidy dist clean spotless install:
@mkdir -p $(addprefix $(OBJ)/,$(SUBDIRS))
set -e; for d in $(SUBDIRS); \
do $(MAKE) -C $(OBJ)/$$d -f $(SRC)/$$d/Makefile \
SRC="$(SRC)"/$$d OBJ="$(OBJ)"/$$d $@; done
SRC="$(SRC)"/$$d OBJ="$(OBJ)"/$$d EFI_BUILD=$(EFI_BUILD) $@; done
6 changes: 3 additions & 3 deletions tests/Makefile
Expand Up @@ -39,15 +39,15 @@ QEMU = qemu-system-i386

all: syslinux-tests pxelinux-tests
syslinux-tests:
$(MAKE) SRC="$(SRC)" OBJ="$(OBJ)" objdir="$(objdir)" \
$(MAKE) SRC="$(SRC)" OBJ="$(OBJ)" objdir="$(objdir)" EFI_BUILD=$(EFI_BUILD) \
INITIAL="$(INITIAL)" INSTALL_DIR="$(SYSLINUX_INSTALL_DIR)" \
CONFIG_FILE="$(SYSLINUX_CONFIG_FILE)" \
DERIVATIVE=SYSLINUX
@sudo $(SRC)/build-syslinux stop $(SYSLINUX_MOUNT_DIR) \
$(SYSLINUX_LOOPDEV) test.cfg

pxelinux-tests:
$(MAKE) SRC="$(SRC)" OBJ="$(OBJ)" objdir="$(objdir)" \
$(MAKE) SRC="$(SRC)" OBJ="$(OBJ)" objdir="$(objdir)" EFI_BUILD=$(EFI_BUILD) \
INITIAL="$(INITIAL)" INSTALL_DIR="$(PXELINUX_INSTALL_DIR)" \
CONFIG_FILE="$(PXELINUX_CONFIG_FILE)" \
DERIVATIVE=PXELINUX
Expand All @@ -71,7 +71,7 @@ SUBDIRS = linux com32
subdirs: $(SUBDIRS)
$(SUBDIRS):
mkdir -p $(OBJ)/$@
$(MAKE) -C $(OBJ)/$@ SRC="$(SRC)"/$@ OBJ="$(OBJ)"/$@/ \
$(MAKE) -C $(OBJ)/$@ SRC="$(SRC)"/$@ OBJ="$(OBJ)"/$@/ EFI_BUILD=$(EFI_BUILD) \
-f $(SRC)/$@/Makefile objdir="$(objdir)/tests" \
INSTALL_DIR="$(INSTALL_DIR)" CONFIG_FILE="$(CONFIG_FILE)" \
DERIVATIVE="$(DERIVATIVE)"
Expand Down

0 comments on commit 2d14923

Please sign in to comment.