diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-09-05 16:27:50 +0100 |
|---|---|---|
| committer | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-11-07 01:05:55 -0600 |
| commit | f479f62c140bbab3869b8e2e783ee0c3f72dab3a (patch) | |
| tree | b6306eca52a912bb03158db05c669ffd48e63763 /RepositoryExternal.mk | |
| parent | 628a812db0d9a53c1936874028c32c975153941d (diff) | |
Make libatomic_ops buildable and enable on non-X86.
Change-Id: Iec1d329f143ab76de7e8b4acd3da66efb6e0220c
Reviewed-on: https://gerrit.libreoffice.org/5812
Reviewed-by: Andrzej J.R. Hunt <andrzej@ahunt.org>
Tested-by: Andrzej J.R. Hunt <andrzej@ahunt.org>
Reviewed-on: https://gerrit.libreoffice.org/6600
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 32711b407980..4228803fae33 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -703,15 +703,10 @@ $(LIBATOMIC_OPS_CFLAGS) \ $(call gb_LinkTarget_use_external_project,$(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 \ + -L$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src/lib -latomic_ops \ ) -endif endef |