[syslinux:master] utils: Use the host toolchain to build.

syslinux-bot for Benoît Allard benoit.allard at greenbone.net
Thu Nov 23 06:15:10 PST 2017


Commit-ID:  6cdeb9ceb8b5fd929a534535d33f61791e8cec60
Gitweb:     http://www.syslinux.org/commit/6cdeb9ceb8b5fd929a534535d33f61791e8cec60
Author:     Benoît Allard <benoit.allard at greenbone.net>
AuthorDate: Thu, 23 Nov 2017 09:02:21 -0500
Committer:  Gene Cumm <gene.cumm at gmail.com>
CommitDate: Thu, 23 Nov 2017 09:02:43 -0500

utils: Use the host toolchain to build.

The utilities are meant to run on the host machine, hence must be built using
the host toolchain.

Signed-off-by: Benoît Allard <benoit.allard at greenbone.net>

(GC): Minor merge conflict

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

---
 utils/Makefile | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/utils/Makefile b/utils/Makefile
index 330e202..b103124 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -19,8 +19,8 @@ include $(MAKEDIR)/syslinux.mk
 
 CC_FOR_BUILD ?= $(CC)
 
-CFLAGS   = $(GCCWARN) -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -I$(SRC)
-LDFLAGS  = -O2
+CFLAGS   = $(CFLAGS_FOR_BUILD) $(GCCWARN) -Os -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -I$(SRC)
+LDFLAGS  = $(LDFLAGS_FOR_BUILD) -O2
 
 C_TARGETS	 = isohybrid gethostip memdiskfind
 SCRIPT_TARGETS	 = mkdiskimage
@@ -37,7 +37,7 @@ ISOHDPFX = $(addprefix $(OBJ)/,../mbr/isohdpfx.bin ../mbr/isohdpfx_f.bin \
 all: $(TARGETS)
 
 %.o: %.c
-	$(CC) $(UMAKEDEPS) $(CFLAGS) -c -o $@ $<
+	$(CC_FOR_BUILD) $(UMAKEDEPS) $(CFLAGS) -c -o $@ $<
 
 mkdiskimage: mkdiskimage.in ../mbr/mbr.bin bin2hex.pl
 	$(PERL) $(SRC)/bin2hex.pl < $(OBJ)/../mbr/mbr.bin | cat $(SRC)/mkdiskimage.in - > $@
@@ -53,13 +53,13 @@ isohdpfx.c: $(ISOHDPFX) isohdpfxarray.pl
 	$(PERL) $(SRC)/isohdpfxarray.pl $(ISOHDPFX) > $@
 
 isohybrid: isohybrid.o isohdpfx.o
-	$(CC) $(LDFLAGS) -o $@ $^ -luuid
+	$(CC_FOR_BUILD) $(LDFLAGS) -o $@ $^ -luuid
 
 gethostip: gethostip.o
-	$(CC) $(LDFLAGS) -o $@ $^
+	$(CC_FOR_BUILD) $(LDFLAGS) -o $@ $^
 
 memdiskfind: memdiskfind.o
-	$(CC) $(LDFLAGS) -o $@ $^
+	$(CC_FOR_BUILD) $(LDFLAGS) -o $@ $^
 
 tidy dist:
 	rm -f *.o .*.d isohdpfx.c


More information about the Syslinux-commits mailing list