diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-08-03 09:20:37 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-08-03 10:38:45 -0400 |
| commit | 06f58c0df7f0f05d6cf8e3e4715f8c4111424640 (patch) | |
| tree | 49e11f5c5f764747c2be4f80f76a41329dc16f9a | |
| parent | c1bf6ca6cc3bb19379a97c751668f1d5b37b4c5d (diff) | |
| download | libvpx-06f58c0df7f0f05d6cf8e3e4715f8c4111424640.tar.gz | |
Fix building of static libs on universal-darwin
The static libs should not be built from sources during the top level
of a universal build. This regression was introduced in commit
495b241fa6b03345baf2b2f39aa8c06c735fccc2, which made the static
libs selectable under CONFIG_STATIC.
Change-Id: I585167e17459877e0fa7fa19e1046c3703d91c97
| -rw-r--r-- | libs.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -180,7 +180,7 @@ endif else LIBVPX_OBJS=$(call objs,$(CODEC_SRCS)) OBJS-$(BUILD_LIBVPX) += $(LIBVPX_OBJS) -LIBS-$(CONFIG_STATIC) += $(BUILD_PFX)libvpx.a $(BUILD_PFX)libvpx_g.a +LIBS-$(if $(BUILD_LIBVPX),$(CONFIG_STATIC)) += $(BUILD_PFX)libvpx.a $(BUILD_PFX)libvpx_g.a $(BUILD_PFX)libvpx_g.a: $(LIBVPX_OBJS) BUILD_LIBVPX_SO := $(if $(BUILD_LIBVPX),$(CONFIG_SHARED)) |