[lmi-commits] [lmi] master 0216c27 3/5: Facilitate switching among architectures

[Greg Chicares]

branch: master
commit 0216c27ec6343c55d5b6da19f6254d46f22ceebd
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Facilitate switching among architectures
    
    Uninstall before building, notably to avoid confusion between
    'foo' and 'foo.exe'.
    
    For posix, ensure that $PERFORM is not "wine'.
    
    For msw, ensure that $LD_LIBRARY_PATH is not set as for native builds.
    Otherwise, running a native command ('xmllint', e.g.) in a makefile
    may fail.
---
 nychthemeral_test.sh | 2 ++
 set_toolchain.sh     | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/nychthemeral_test.sh b/nychthemeral_test.sh
index d25d1c4..7b053cf 100755
--- a/nychthemeral_test.sh
+++ b/nychthemeral_test.sh
@@ -175,6 +175,8 @@ printf 'LMI_TRIPLET = "%s"\n' "$LMI_TRIPLET" > /dev/tty
 
 cd /opt/lmi/src/lmi
 
+make "$coefficiency" --output-sync=recurse uninstall
+
 printf '\n# test concinnity\n\n'
 make "$coefficiency" check_concinnity 2>&1 \
   | tee "$log_dir"/concinnity | sed -e "$build_clutter" -e 
"$concinnity_clutter"
diff --git a/set_toolchain.sh b/set_toolchain.sh
index 0af1edc..f71c5d2 100755
--- a/set_toolchain.sh
+++ b/set_toolchain.sh
@@ -132,8 +132,12 @@ 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" value.
+                PERFORM=
                 ;;
             (*-*-mingw32)
+                # Nullify any leftover value from the native case above.
+                LD_LIBRARY_PATH=
                 PERFORM="wine"
                 w0="$(winepath -w "$localbindir" | sed -e's/\\/\\\\/g')"
                 w1="$(winepath -w "$locallibdir" | sed -e's/\\/\\\\/g')"