35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
|
The result of $(wildcard *) is random.
|
||
|
|
Sort input files to reduce build-compare noise.
|
||
|
|
|
||
|
|
---
|
||
|
|
extras/mini-os/Makefile | 2 +-
|
||
|
|
extras/mini-os/arch/x86/Makefile | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
Index: xen-4.5.0-testing/extras/mini-os/Makefile
|
||
|
|
===================================================================
|
||
|
|
--- xen-4.5.0-testing.orig/extras/mini-os/Makefile
|
||
|
|
+++ xen-4.5.0-testing/extras/mini-os/Makefile
|
||
|
|
@@ -158,7 +158,7 @@ endif
|
||
|
|
|
||
|
|
$(OBJ_DIR)/lwip.a: $(LWO)
|
||
|
|
$(RM) $@
|
||
|
|
- $(AR) cqs $@ $^
|
||
|
|
+ $(AR) cqs $@ $(sort $^)
|
||
|
|
|
||
|
|
OBJS += $(OBJ_DIR)/lwip.a
|
||
|
|
endif
|
||
|
|
Index: xen-4.5.0-testing/extras/mini-os/arch/x86/Makefile
|
||
|
|
===================================================================
|
||
|
|
--- xen-4.5.0-testing.orig/extras/mini-os/arch/x86/Makefile
|
||
|
|
+++ xen-4.5.0-testing/extras/mini-os/arch/x86/Makefile
|
||
|
|
@@ -24,7 +24,7 @@ all: $(OBJ_DIR)/$(ARCH_LIB)
|
||
|
|
# $(HEAD_ARCH_OBJ) is only build here, needed on linking
|
||
|
|
# in ../../Makefile.
|
||
|
|
$(OBJ_DIR)/$(ARCH_LIB): $(ARCH_OBJS) $(OBJ_DIR)/$(HEAD_ARCH_OBJ)
|
||
|
|
- $(AR) rv $(OBJ_DIR)/$(ARCH_LIB) $(ARCH_OBJS)
|
||
|
|
+ $(AR) rv $(OBJ_DIR)/$(ARCH_LIB) $(sort $(ARCH_OBJS))
|
||
|
|
|
||
|
|
clean:
|
||
|
|
rm -f $(OBJ_DIR)/$(ARCH_LIB) $(ARCH_OBJS) $(OBJ_DIR)/$(HEAD_ARCH_OBJ)
|