[syslinux:master] make: Sort object files for reproducible linking order

syslinux-bot for Reiner Herrmann reiner at reiner-h.de
Sat Nov 4 09:54:12 PDT 2017


Commit-ID:  f1e7b73dd8c1d657fd68640c6a2cf430872e703e
Gitweb:     http://www.syslinux.org/commit/f1e7b73dd8c1d657fd68640c6a2cf430872e703e
Author:     Reiner Herrmann <reiner at reiner-h.de>
AuthorDate: Sat, 4 Nov 2017 11:32:32 -0400
Committer:  Gene Cumm <gene.cumm at gmail.com>
CommitDate: Sat, 4 Nov 2017 11:32:53 -0400

make: Sort object files for reproducible linking order

Author: Reiner Herrmann <reiner at reiner-h.de>

Change be645d7a was not extended to the efi/Makefile previously; this
patch addresses this.

Signed-off-by: Gene Cumm <gene.cumm at gmail.com>

---
 efi/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/efi/Makefile b/efi/Makefile
index d3788d9..869edfe 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


More information about the Syslinux-commits mailing list