summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToomas Soome <tsoome@me.com>2019-08-09 16:41:34 +0300
committerToomas Soome <tsoome@me.com>2019-08-10 19:20:06 +0300
commitcc7e66e6be0e280179bd43f44f08e442d9839a8f (patch)
tree6fcaace6409efaab947af79852f80f67e67be5df
parent4f7f6babe29cc8387cc404ff3a766f592117778a (diff)
downloadillumos-joyent-cc7e66e6be0e280179bd43f44f08e442d9839a8f.tar.gz
11537 loader: i386 build is missing -m32 sometimes
Reviewed by: Andrew Stormont <andyjstormont@gmail.com> Reviewed by: Aurélien Larcher <aurelien.larcher@gmail.com> Reviewed by: Andy Fiddaman <andy@omniosce.org> Approved by: Robert Mustacchi <rm@joyent.com>
-rw-r--r--usr/src/boot/sys/boot/efi/loader/i386/Makefile2
-rw-r--r--usr/src/boot/sys/boot/libstand/i386/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/boot/sys/boot/efi/loader/i386/Makefile b/usr/src/boot/sys/boot/efi/loader/i386/Makefile
index c4a451fba0..e0cb936fd5 100644
--- a/usr/src/boot/sys/boot/efi/loader/i386/Makefile
+++ b/usr/src/boot/sys/boot/efi/loader/i386/Makefile
@@ -15,7 +15,6 @@
#
MACHINE= $(MACH)
-ASFLAGS= -m32
EFIPROG= loader32.efi
all: $(EFIPROG)
@@ -27,6 +26,7 @@ LDFLAGS += -znocombreloc
efi_main.o := CPPFLAGS += -DLOADER_EFI=L\"loader32.efi\"
CFLAGS += -m32
+CCASFLAGS += -m32
CLEANFILES += machine x86 $(EFIPROG)
diff --git a/usr/src/boot/sys/boot/libstand/i386/Makefile b/usr/src/boot/sys/boot/libstand/i386/Makefile
index 76ba41c582..4837c0eb4d 100644
--- a/usr/src/boot/sys/boot/libstand/i386/Makefile
+++ b/usr/src/boot/sys/boot/libstand/i386/Makefile
@@ -22,7 +22,7 @@ all install: $(LIBRARY)
include ../Makefile.com
CFLAGS += -m32
-ASFLAGS += -m32
+CCASFLAGS += -m32
CLEANFILES += x86