diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-06 17:55:26 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-06 17:57:53 -0300 |
| commit | 88d6f79ac087d2318f4e532ae99e0bc50bbc1929 (patch) | |
| tree | 53673e9cb604fcd7217a2e06f396f2af551c035e /ffbuild | |
| parent | 7a5a1c8c97d6c7db2efe534d17be5f33c1a30adb (diff) | |
| parent | 857e26b655a769e5a56bada1a0d9adb44cc176b7 (diff) | |
| download | ffmpeg-88d6f79ac087d2318f4e532ae99e0bc50bbc1929.tar.gz | |
Merge commit '857e26b655a769e5a56bada1a0d9adb44cc176b7'
* commit '857e26b655a769e5a56bada1a0d9adb44cc176b7':
build: Add an option for passing linker flags to the shared library build
See e34a3468f294f21878875e0f6ad5564cd52af70e.
--extra-ldlibflags is left in place for compatibility reasons.
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'ffbuild')
| -rw-r--r-- | ffbuild/library.mak | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ffbuild/library.mak b/ffbuild/library.mak index 42ef78d0a3..ed269fdab6 100644 --- a/ffbuild/library.mak +++ b/ffbuild/library.mak @@ -48,7 +48,7 @@ $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) $(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SLIBOBJS) $(SUBDIR)lib$(NAME).ver $(SLIB_CREATE_DEF_CMD) - $$(LD) $(SHFLAGS) $(LDFLAGS) $(LDLIBFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS) + $$(LD) $(SHFLAGS) $(LDFLAGS) $(LDSOFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS) $(SLIB_EXTRA_CMD) ifdef SUBDIR |