sdk: Fixed LD_LIBRARY_PATH for bootstrap; Cross-compiling fixes

diff --git a/crossplatform.mk b/crossplatform.mk
index d9b6613..053311f 100755 (executable)
--- a/crossplatform.mk
+++ b/crossplatform.mk
@@ -188,6 +188,7 @@ INSTALLNAME := $(if $(OSX_TARGET),$(if $(STATIC_LIBRARY_TARGET),-install_name $(
 SHAREDLIB := $(if $(SHARED_LIBRARY_TARGET),$(if $(OSX_TARGET),-dynamiclib -single_module -multiply_defined suppress,-shared),)
 LINKOPT :=
 STRIPOPT := $(if $(OSX_TARGET),$(if $(SHARED_LIBRARY_TARGET),-x, -u -r), -x --strip-unneeded --remove-section=.comment --remove-section=.note)
+HOST_SODESTDIR := $(if $(WINDOWS_HOST),obj/$(HOST_PLATFORM)/bin/,obj/$(HOST_PLATFORM)/lib/)
 SODESTDIR := $(if $(WINDOWS_TARGET),obj/$(TARGET_PLATFORM)/bin/,obj/$(TARGET_PLATFORM)/lib/)
 
 # EXCLUDED_LIBS TOOL

diff --git a/default.cf b/default.cf
index 2b5b4a9..7920a6e 100644 (file)
--- a/default.cf
+++ b/default.cf
@@ -13,9 +13,9 @@ export ECS := $(call psep,$(EC_BINS)ecs$(HOST_E))$(if $(CROSS_TARGET), -t $(TARG
 export EAR := $(call psep,$(_CF_DIR)obj/$(HOST_PLATFORM)/bin/ear$(HOST_E))
 UPX := upx
 
-ifndef WINDOWS_TARGET
-export LD_LIBRARY_PATH = ../../obj/$(HOST_PLATFORM)/lib/
-export DYLD_LIBRARY_PATH = ../../obj/$(HOST_PLATFORM)/lib/
+ifndef WINDOWS_HOST
+export LD_LIBRARY_PATH = $(_CF_DIR)obj/$(HOST_PLATFORM)/lib/
+export DYLD_LIBRARY_PATH = $(_CF_DIR)obj/$(HOST_PLATFORM)/lib/
 endif
 
 ifeq "$(HOST_ARCH)" "ARM"

diff --git a/ecere/Makefile b/ecere/Makefile
index ee78c2c..df6fce5 100755 (executable)
--- a/ecere/Makefile
+++ b/ecere/Makefile
@@ -534,7 +534,7 @@ endif
 else
        $(AR) rcs $(TARGET) $(OBJECTS) $(LIBS)
 endif
-       $(call cpq,$(TARGET),../$(SODESTDIR))
+       $(call cpq,$(TARGET),../$(HOST_SODESTDIR))
 ifdef LINUX_TARGET
        ln -sf $(LP)$(MODULE)$(SO).0.44 ../$(SODESTDIR)$(LP)$(MODULE)$(SO).0
        ln -sf $(LP)$(MODULE)$(SO).0.44 ../$(SODESTDIR)$(LP)$(MODULE)$(SO)