From 06f58c0df7f0f05d6cf8e3e4715f8c4111424640 Mon Sep 17 00:00:00 2001 From: John Koleszar Date: Wed, 3 Aug 2011 09:20:37 -0400 Subject: 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 --- libs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs.mk b/libs.mk index fed1847fb..757e068d2 100644 --- a/libs.mk +++ b/libs.mk @@ -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)) -- cgit v1.2.1