aboutsummaryrefslogtreecommitdiffstats
path: root/com32/gpllib
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2013-01-08 16:09:03 +0000
committerMatt Fleming <matt.fleming@intel.com>2013-01-08 16:29:05 +0000
commitaf75baf78acda2f8d1b463cb3c155ab67200e128 (patch)
tree38cfd25a692e2a8a6586881b2ff16bc09bf003de /com32/gpllib
parent7eda4ce3c7ad2b3ea4ab104e007b3be30b33e4cf (diff)
parent90b5864fc7935362b797ea33307aaa7c37a52753 (diff)
downloadsyslinux-af75baf78acda2f8d1b463cb3c155ab67200e128.tar.gz
syslinux-af75baf78acda2f8d1b463cb3c155ab67200e128.tar.xz
syslinux-af75baf78acda2f8d1b463cb3c155ab67200e128.zip
Merge branch 'elflink' into firmware
Merge the changes since Syslinux-5.00. The main reason behind this merge is to pull in the following bug fix, commit 90b5864fc793 ("core/kaboom.c: Export __bad_SEG()"), which allows us to turn on debugging in mk/devel.mk without ldlinux.c32 failing to load. Conflicts: com32/elflink/ldlinux/Makefile version
Diffstat (limited to 'com32/gpllib')
-rw-r--r--com32/gpllib/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/com32/gpllib/Makefile b/com32/gpllib/Makefile
index 71f335da..4d0bb82f 100644
--- a/com32/gpllib/Makefile
+++ b/com32/gpllib/Makefile
@@ -24,7 +24,7 @@ makeoutputdirs:
$(addprefix $(OBJ),$(sort $(dir $(LIBOBJS)))),$(b))
libcom32gpl.c32 : $(LIBOBJS)
- $(LD) -shared $(LDFLAGS) -o $@ $^
+ $(LD) -shared $(LDFLAGS) -soname $(@F) -o $@ $^
tidy dist clean:
find . \( -name \*.o -o -name .\*.d -o -name \*.tmp \) -print0 | \