Skip to content

Commit 69031b6

Browse files
author
Bernhard M. Wiedemann
authored
Sort lists of input files (#313)
For reproducible .a files in spite of non-deterministic filesystem readdir order Without this patch, find returned files in filesystem order and llvm-ar used that order to create .a files.
1 parent 294b23c commit 69031b6

1 file changed

Lines changed: 7 additions & 6 deletions

File tree

Makefile

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,9 @@ LIBC_BOTTOM_HALF_HEADERS_PUBLIC = $(LIBC_BOTTOM_HALF_DIR)/headers/public
5050
LIBC_BOTTOM_HALF_HEADERS_PRIVATE = $(LIBC_BOTTOM_HALF_DIR)/headers/private
5151
LIBC_BOTTOM_HALF_SOURCES = $(LIBC_BOTTOM_HALF_DIR)/sources
5252
LIBC_BOTTOM_HALF_ALL_SOURCES = \
53+
$(sort \
5354
$(shell find $(LIBC_BOTTOM_HALF_CLOUDLIBC_SRC) -name \*.c) \
54-
$(shell find $(LIBC_BOTTOM_HALF_SOURCES) -name \*.c)
55+
$(shell find $(LIBC_BOTTOM_HALF_SOURCES) -name \*.c))
5556

5657
# FIXME(https://reviews.llvm.org/D85567) - due to a bug in LLD the weak
5758
# references to a function defined in `chdir.c` only work if `chdir.c` is at the
@@ -61,13 +62,13 @@ LIBC_BOTTOM_HALF_ALL_SOURCES := $(filter-out $(LIBC_BOTTOM_HALF_SOURCES)/chdir.c
6162
LIBC_BOTTOM_HALF_ALL_SOURCES := $(LIBC_BOTTOM_HALF_ALL_SOURCES) $(LIBC_BOTTOM_HALF_SOURCES)/chdir.c
6263

6364
LIBWASI_EMULATED_MMAN_SOURCES = \
64-
$(shell find $(LIBC_BOTTOM_HALF_DIR)/mman -name \*.c)
65+
$(sort $(shell find $(LIBC_BOTTOM_HALF_DIR)/mman -name \*.c))
6566
LIBWASI_EMULATED_PROCESS_CLOCKS_SOURCES = \
66-
$(shell find $(LIBC_BOTTOM_HALF_DIR)/clocks -name \*.c)
67+
$(sort $(shell find $(LIBC_BOTTOM_HALF_DIR)/clocks -name \*.c))
6768
LIBWASI_EMULATED_GETPID_SOURCES = \
68-
$(shell find $(LIBC_BOTTOM_HALF_DIR)/getpid -name \*.c)
69+
$(sort $(shell find $(LIBC_BOTTOM_HALF_DIR)/getpid -name \*.c))
6970
LIBWASI_EMULATED_SIGNAL_SOURCES = \
70-
$(shell find $(LIBC_BOTTOM_HALF_DIR)/signal -name \*.c)
71+
$(sort $(shell find $(LIBC_BOTTOM_HALF_DIR)/signal -name \*.c))
7172
LIBWASI_EMULATED_SIGNAL_MUSL_SOURCES = \
7273
$(LIBC_TOP_HALF_MUSL_SRC_DIR)/signal/psignal.c \
7374
$(LIBC_TOP_HALF_MUSL_SRC_DIR)/string/strsignal.c
@@ -199,7 +200,7 @@ LIBC_TOP_HALF_HEADERS_PRIVATE = $(LIBC_TOP_HALF_DIR)/headers/private
199200
LIBC_TOP_HALF_SOURCES = $(LIBC_TOP_HALF_DIR)/sources
200201
LIBC_TOP_HALF_ALL_SOURCES = \
201202
$(LIBC_TOP_HALF_MUSL_SOURCES) \
202-
$(shell find $(LIBC_TOP_HALF_SOURCES) -name \*.c)
203+
$(sort $(shell find $(LIBC_TOP_HALF_SOURCES) -name \*.c))
203204

204205
# Add any extra flags
205206
CFLAGS = $(EXTRA_CFLAGS)

0 commit comments

Comments
 (0)