[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 5469431d 2/4: Let only one platform-specific
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 5469431d 2/4: Let only one platform-specific path be nonempty |
Date: |
Wed, 15 Jun 2022 11:18:58 -0400 (EDT) |
branch: master
commit 5469431d7ec4bdf4de0e4463454039e294ab84c6
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Let only one platform-specific path be nonempty
Nullifying $LD_LIBRARY_PATH for msw, but not $WINEPATH for posix, was
a jarring inconsistency that called for a comment at least.
Upon reflection, it seems best to ensure that one or the other is always
empty, because each platform should work without the other's path.
---
set_toolchain.sh | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/set_toolchain.sh b/set_toolchain.sh
index ce652cdf..4bb5ea56 100755
--- a/set_toolchain.sh
+++ b/set_toolchain.sh
@@ -135,12 +135,17 @@ case "$lmi_build_type" in
LD_LIBRARY_PATH=.
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$locallibdir"
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$bindir"
- # Nullify any leftover "wine" values.
+ # Nullify any leftover "wine" values: obligatorily for
+ # $EXEEXT and $PERFORM, and for $WINEPATH to ensure
+ # that native builds never depend upon it.
EXEEXT=
PERFORM=
+ WINEPATH=
;;
(*-*-mingw32)
- # Nullify any leftover value from the native case above.
+ # Nullify any leftover $LD_LIBRARY_PATH value from the
+ # native case above, to ensure that lmi-built msw
+ # binaries never depend upon it.
LD_LIBRARY_PATH=
EXEEXT=".exe"
PERFORM="wine"