diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 5dbb4f1360..deec0c53a1 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,12 @@ The license applies to all entries newer than 2009-04-28. */ +2011-04-20 00:23 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/config/linux/libs.mk + * harbour/config/android/libs.mk + * filter out libraries which does not exists in android inside + android not linux config files + 2011-04-19 21:15 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbqt/hbqt_common.hbc ! do not satisfy the HBQT dependency when HB_BUILD_3RDEXT=no. diff --git a/harbour/config/android/libs.mk b/harbour/config/android/libs.mk index fd3f59765e..8788562d22 100644 --- a/harbour/config/android/libs.mk +++ b/harbour/config/android/libs.mk @@ -3,3 +3,5 @@ # include $(TOP)$(ROOT)config/linux/libs.mk + +SYSLIBS := $(filter-out rt pthread, $(SYSLIBS)) diff --git a/harbour/config/linux/libs.mk b/harbour/config/linux/libs.mk index 82927da76f..1eed434094 100644 --- a/harbour/config/linux/libs.mk +++ b/harbour/config/linux/libs.mk @@ -33,13 +33,10 @@ ifneq ($(HB_LINKING_RTL),) ifeq ($(HB_HAS_ZLIB_LOCAL),) SYSLIBS += z endif - SYSLIBS += dl - ifneq ($(HB_PLATFORM),android) - SYSLIBS += rt - # Don't seem to be needed here, but added it for reference to move/copy it to *nix platforms where this is required - ifneq ($(HB_LINKING_VMMT),) - SYSLIBS += pthread - endif + SYSLIBS += rt dl + # Don't seem to be needed here, but added it for reference to move/copy it to *nix platforms where this is required + ifneq ($(HB_LINKING_VMMT),) + SYSLIBS += pthread endif endif