summaryrefslogtreecommitdiff
path: root/RepositoryExternal.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-10-24 12:22:58 +0200
committerMichael Stahl <mstahl@redhat.com>2013-10-24 13:10:39 +0200
commitb308526fbc07753aca7186ab84e92ae8d56d7652 (patch)
tree32a557867e5f74acc78bc117e1592b27db673520 /RepositoryExternal.mk
parentb242cee828704e136a47165fb473513b9b909b27 (diff)
libatomic_ops: use libraries from WORKDIR
Change-Id: I9d1267d6fc14a3149fb92a486bee3023a531e574
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r--RepositoryExternal.mk14
1 files changed, 10 insertions, 4 deletions
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