From b308526fbc07753aca7186ab84e92ae8d56d7652 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Thu, 24 Oct 2013 12:22:58 +0200
Subject: libatomic_ops: use libraries from WORKDIR

Change-Id: I9d1267d6fc14a3149fb92a486bee3023a531e574
---
 RepositoryExternal.mk | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'RepositoryExternal.mk')

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 38fb47055b87..9a138b53e51a 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -688,17 +688,23 @@ $(LIBATOMIC_OPS_CFLAGS) \
 	$$(INCLUDE) \
 	$(LIBATOMIC_OPS_CFLAGS) \
 )
-$(call gb_LinkTarget_use_package,$(1),\
+$(call gb_LinkTarget_use_external_project,$(1),\
 	libatomic_ops \
 )
-$(call gb_LinkTarget_use_static_libraries,$(1),\
-	libatomic_ops \
+ifeq ($(COM),MSC)
+$(call gb_LinkTarget_add_libs,$(1),\
+	$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src/lib/.libs/libatomic_ops-7.2d.lib \
 )
+else
+$(call gb_LinkTarget_add_libs,$(1),\
+	-L$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src/lib/.libs -latomic_ops-7.2d \
+)
+endif
 
 endef
 
 define gb_ExternalProject__use_libatomic_ops
-$(call gb_ExternalProject_use_package,$(1),libatomic_ops)
+$(call gb_ExternalProject_use_external_project,$(1),libatomic_ops)
 
 endef
 
-- 
cgit