diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-11-06 19:41:30 +0000 |
|---|---|---|
| committer | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-11-06 19:41:30 +0000 |
| commit | 31fd531b2757269dde108b362752f7949615736a (patch) | |
| tree | 373e19d27475709d26c8f1222a2604b6a5225662 /RepositoryExternal.mk | |
| parent | 0351eaf42f4ebda8564f0f7cdf32706dfff735f6 (diff) | |
Revert "Make libatomic_ops buildable and enable on non-X86."
(Pushed from wrong branch -- incomplete/broken.)
This reverts commit 0351eaf42f4ebda8564f0f7cdf32706dfff735f6.
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 0f557a7ed18f..32711b407980 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -703,10 +703,15 @@ $(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 -latomic_ops \ + -L$(call gb_UnpackedTarball_get_dir,libatomic_ops)/src/lib/.libs -latomic_ops-7.2d \ ) +endif endef @@ -3153,7 +3158,6 @@ $(call gb_ExternalExecutable_set_external,python,$(call gb_UnpackedTarball_get_d # target, as that is not used on Mac) $(call gb_ExternalExecutable_add_dependencies,python,$(call gb_GeneratedPackage_get_target_for_build,python3)) -<<<<<<< HEAD else $(call gb_ExternalExecutable_set_internal,python,$(INSTROOT)/$(LIBO_BIN_FOLDER)/$(if $(filter WNT,$(OS)),python-core-$(PYTHON_VERSION)/bin/python.exe,python.bin)) |