aboutsummaryrefslogtreecommitdiffstats
path: root/com32/MCONFIG
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-05-25 15:50:12 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-05-25 15:50:12 -0700
commit12f1c65e7748559aef772cfe760be11f1f7745fa (patch)
tree140317122ecc0862a3006f534de4fee5c38b8c1e /com32/MCONFIG
parent66faa55d9decdea13f3be830e9999c23574a34c5 (diff)
parent942aadea9468884dfbc2a7c8428f52bbb5ecf360 (diff)
downloadsyslinux-12f1c65e7748559aef772cfe760be11f1f7745fa.tar.gz
syslinux-12f1c65e7748559aef772cfe760be11f1f7745fa.tar.xz
syslinux-12f1c65e7748559aef772cfe760be11f1f7745fa.zip
Merge branch 'master' into core32
Conflicts: com32/MCONFIG Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/MCONFIG')
-rw-r--r--com32/MCONFIG7
1 files changed, 4 insertions, 3 deletions
diff --git a/com32/MCONFIG b/com32/MCONFIG
index 414011a8..6d25b2d4 100644
--- a/com32/MCONFIG
+++ b/com32/MCONFIG
@@ -43,7 +43,8 @@ SFLAGS = $(GCCOPT) -W -Wall -march=i386 \
-nostdinc -iwithprefix include \
-I$(com32)/libutil/include -I$(com32)/include $(GPLINCLUDE)
-LDFLAGS = -m elf_i386 --emit-relocs -T $(com32)/lib/com32.ld
+COM32LD = $(com32)/lib/com32.ld
+LDFLAGS = -m elf_i386 --emit-relocs -T $(COM32LD)
LIBGCC := $(shell $(CC) $(GCCOPT) --print-libgcc)
LNXCFLAGS = -I$(com32)/libutil/include -W -Wall -O -g -D_GNU_SOURCE
@@ -65,8 +66,8 @@ C_LNXLIBS = $(com32)/libutil/libutil_lnx.a
$(CC) $(MAKEDEPS) $(CFLAGS) -c -o $@ $<
.PRECIOUS: %.elf
-%.elf: %.o $(LIBS) $(C_LIBS)
- $(LD) $(LDFLAGS) -o $@ $^
+%.elf: %.o $(LIBS) $(C_LIBS) $(COM32LD)
+ $(LD) $(LDFLAGS) -o $@ $(filter-out $(COM32LD),$^)
.PRECIOUS: %.lo
%.lo: %.S