Skip to content

Commit 30afe9b

Browse files
committed
Work around an issue where the order of flags matters on old nasm
1 parent 50eef84 commit 30afe9b

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

GNUmakefile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,9 @@ ifeq ($(ARCH),ia32)
107107
-mno-mmx
108108
override LDFLAGS += \
109109
-m elf_i386
110-
override NASMFLAGS += \
111-
-f elf32
110+
override NASMFLAGS := \
111+
-f elf32 \
112+
$(NASMFLAGS)
112113
endif
113114
ifeq ($(ARCH),x86_64)
114115
ifeq ($(CC_IS_CLANG),1)
@@ -125,8 +126,9 @@ ifeq ($(ARCH),x86_64)
125126
-mno-red-zone
126127
override LDFLAGS += \
127128
-m elf_x86_64
128-
override NASMFLAGS += \
129-
-f elf64
129+
override NASMFLAGS := \
130+
-f elf64 \
131+
$(NASMFLAGS)
130132
endif
131133

132134
# Internal linker flags that should not be changed by the user.

0 commit comments

Comments
 (0)