diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2013-01-08 16:09:03 +0000 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2013-01-08 16:29:05 +0000 |
| commit | af75baf78acda2f8d1b463cb3c155ab67200e128 (patch) | |
| tree | 38cfd25a692e2a8a6586881b2ff16bc09bf003de /com32/lib/Makefile | |
| parent | 7eda4ce3c7ad2b3ea4ab104e007b3be30b33e4cf (diff) | |
| parent | 90b5864fc7935362b797ea33307aaa7c37a52753 (diff) | |
| download | syslinux-af75baf78acda2f8d1b463cb3c155ab67200e128.tar.gz | |
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/lib/Makefile')
| -rw-r--r-- | com32/lib/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/com32/lib/Makefile b/com32/lib/Makefile index f83e8179..2a47fc6f 100644 --- a/com32/lib/Makefile +++ b/com32/lib/Makefile @@ -91,7 +91,7 @@ makeoutputdirs: libcom32.c32 : $(LIBOBJS) rm -f $@ - $(LD) -shared $(LDFLAGS) -o $@ $^ + $(LD) -shared $(LDFLAGS) -soname $(@F) -o $@ $^ libcom32min.a : $(MINLIBOBJS) rm -f $@ |