My commit 6ab38b6d244e0de21b9dd94052e0da30adc4aff3 added
DYLD_FALLBACK_LIBRARY_PATH to the host environment on Mac OS. However,
this is not enough: Running tic(1) in ncurses.install stage fails
because the libraries in sysroot-host/lib cannot be found.
This commit fixes the problem by adding DYLD_FALLBACK_LIBRARY_PATH
also in the cross environment. On operating systems other than Mac OS
(Darwin), nothing should change.
Signed-off-by: Bernhard Walle <bernh...@bwalle.de>
---
rules/pre/Rules.make | 15 +++++++++------
1 Datei geändert, 9 Zeilen hinzugefügt(+), 6 Zeilen entfernt(-)
diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make
index 522c90e..6d59bf3 100644
--- a/rules/pre/Rules.make
+++ b/rules/pre/Rules.make
@@ -36,6 +36,12 @@ CROSS_PATH :=
$(PTXDIST_SYSROOT_CROSS)/bin:$(PTXDIST_SYSROOT_CROSS)/sbin:$$PATH
# Environment
# ----------------------------------------------------------------------------
+# needed both in the host and cross environment because we may host-tools
+# also when cross-compiling.
+ifeq ($(shell uname -s),Darwin)
+HOST_LIBRARY_PATH :=
DYLD_FALLBACK_LIBRARY_PATH=$(PTXDIST_SYSROOT_HOST)/lib
+endif
+
#
# Environment variables for the compiler
#
@@ -254,7 +260,8 @@ CROSS_ENV := \
$(CROSS_ENV_PROGS) \
$(CROSS_ENV_FLAGS) \
$(CROSS_ENV_PKG_CONFIG) \
- $(CROSS_ENV_AC)
+ $(CROSS_ENV_AC) \
+ $(HOST_LIBRARY_PATH)
#
@@ -321,10 +328,6 @@ HOST_ENV_CXX := CXX="$(HOSTCXX)"
HOST_ENV_CPPFLAGS := CPPFLAGS="$(HOST_CPPFLAGS)"
HOST_ENV_LDFLAGS := LDFLAGS="$(HOST_LDFLAGS)"
-ifeq ($(shell uname -s),Darwin)
-HOST_ENV_LIBRARY_PATH :=
DYLD_FALLBACK_LIBRARY_PATH=$(PTXDIST_SYSROOT_HOST)/lib
-endif
-
HOST_ENV_PKG_CONFIG := \
PKG_CONFIG_PATH="" \
PKG_CONFIG_LIBDIR="$(PTXDIST_SYSROOT_HOST)/lib/pkgconfig:$(PTXDIST_SYSROOT_HOST)/share/pkgconfig"
@@ -340,7 +343,7 @@ HOST_ENV := \
$(HOST_ENV_LDFLAGS) \
$(HOST_ENV_PKG_CONFIG) \
$(HOST_ENV_PYTHONPATH) \
- $(HOST_ENV_LIBRARY_PATH)
+ $(HOST_LIBRARY_PATH)
HOST_AUTOCONF := --prefix=
--
1.7.10.4
--
ptxdist mailing list
ptxdist@pengutronix.de
