From 70d4cc71eec932452ad061d486522c7bb3d25204 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 10 Jun 2010 00:04:20 +0000 Subject: [PATCH] 2010-06-10 02:02 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/global.mk ! Attempt to fix rare case when Windows cross-build on Linux platform wrongly changed HB_BUILD_SHARED mode on. IOW now automatic HB_BUILD_SHARED defaulting logic (based on install location) only kicks in if the target platform is *nix. Tamas could you please retest it? --- harbour/ChangeLog | 8 ++++++++ harbour/config/global.mk | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 0d92dd4543..6eda2f9a32 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,13 @@ The license applies to all entries newer than 2009-04-28. */ +2010-06-10 02:02 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/global.mk + ! Attempt to fix rare case when Windows cross-build on Linux + platform wrongly changed HB_BUILD_SHARED mode on. IOW now + automatic HB_BUILD_SHARED defaulting logic (based on install + location) only kicks in if the target platform is *nix. + Tamas could you please retest it? 2010-06-10 01:02 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/src/rtl/hbcom.c @@ -29,6 +36,7 @@ Thanks to Vitomir Cvitanovic for CA-VO tests. Warning! After any modifications in such files Harbour DBF* RDDs will correct above signatures to standard DBASE ones (0x03 and 0x83). + 2010-06-10 00:03 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * examples/uhttpd2/umain.prg * examples/uhttpd2/uhttpd2.hbp diff --git a/harbour/config/global.mk b/harbour/config/global.mk index 06cf7abaa2..620db1c7a7 100644 --- a/harbour/config/global.mk +++ b/harbour/config/global.mk @@ -1317,8 +1317,10 @@ export HB_SYSLOC ifneq ($(HB_INSTALL_PREFIX),) ifeq ($(HB_BUILD_SHARED),) - ifeq ($(HB_SYSLOC),yes) - export HB_BUILD_SHARED := yes + ifneq ($(HB_PLATFORM_UNIX),) + ifeq ($(HB_SYSLOC),yes) + export HB_BUILD_SHARED := yes + endif endif endif