diff options
| author | Reiner Herrmann <reiner@reiner-h.de> | 2017-11-04 11:32:32 -0400 |
|---|---|---|
| committer | Gene Cumm <gene.cumm@gmail.com> | 2017-11-04 11:32:53 -0400 |
| commit | f1e7b73dd8c1d657fd68640c6a2cf430872e703e (patch) | |
| tree | e61e5a54decffeea97e5f20ad26c498d7f105201 | |
| parent | ce3d03a0556b11f43b30966cbf51213cb5564897 (diff) | |
| download | syslinux-f1e7b73dd8c1d657fd68640c6a2cf430872e703e.tar.gz syslinux-f1e7b73dd8c1d657fd68640c6a2cf430872e703e.tar.xz syslinux-f1e7b73dd8c1d657fd68640c6a2cf430872e703e.zip | |
make: Sort object files for reproducible linking order
Author: Reiner Herrmann <reiner@reiner-h.de>
Change be645d7a was not extended to the efi/Makefile previously; this
patch addresses this.
Signed-off-by: Gene Cumm <gene.cumm@gmail.com>
| -rw-r--r-- | efi/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/efi/Makefile b/efi/Makefile index d3788d90..869edfef 100644 --- a/efi/Makefile +++ b/efi/Makefile @@ -17,15 +17,15 @@ include $(MAKEDIR)/efi.mk # Upstream gnu-efi has old-style function definitions. CFLAGS += -Wno-strict-prototypes -CORE_CSRC := $(wildcard $(core)/*.c $(core)/*/*.c $(core)/*/*/*.c) +CORE_CSRC := $(sort $(wildcard $(core)/*.c $(core)/*/*.c $(core)/*/*/*.c)) CORE_COBJ := $(subst $(core),$(OBJ)/../core,$(patsubst %.c,%.o,$(CORE_CSRC))) # We don't want to include any of the networking stack or the thread # code since it will be implemented completely differently for EFI. -FILTERED_OBJS:= $(subst $(core),$(OBJ)/../core,$(patsubst %.c,%.o, \ +FILTERED_OBJS:= $(sort $(subst $(core),$(OBJ)/../core,$(patsubst %.c,%.o, \ $(wildcard $(core)/legacynet/*.c) \ $(wildcard $(core)/fs/pxe/*.c) \ - $(wildcard $(core)/thread/*.c))) + $(wildcard $(core)/thread/*.c)))) # Don't include unit tests FILTERED_OBJS += $(subst $(core),$(OBJ)/../core, \ @@ -44,7 +44,7 @@ CORE_OBJS += $(addprefix $(OBJ)/../core/, \ LIB_OBJS = $(addprefix $(objdir)/com32/lib/,$(CORELIBOBJS)) \ $(LIBEFI) -CSRC = $(wildcard $(SRC)/*.c) +CSRC = $(sort $(wildcard $(SRC)/*.c)) OBJS = $(subst $(SRC)/,,$(filter-out %wrapper.o, $(patsubst %.c,%.o,$(CSRC)))) OBJS += $(objdir)/core/codepage.o $(ARCH)/linux.o |