[lmi-commits] [lmi] master f2caa81 2/2: Merge changes from branch odd/multiarch

[Greg Chicares]

branch: master
commit f2caa8139bd1fbcf7cf712215b90434a00442f66
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>

    Merge changes from branch odd/multiarch
---
 INSTALL              |  4 ++--
 gui_test.sh          | 10 +---------
 gwc/.zshrc           |  6 ++++++
 nychthemeral_test.sh | 10 +---------
 4 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/INSTALL b/INSTALL
index ca2e02f..233d2e5 100644
--- a/INSTALL
+++ b/INSTALL
@@ -79,8 +79,8 @@ Installation proceeds silently for anywhere from a few 
minutes to a couple
 of hours, depending on your computer. When you see "Finished building lmi",
 copy and paste these lines into the shell:
 
-  export PATH=/opt/lmi/local/bin:/opt/lmi/local/lib:$PATH
-  cd /opt/lmi/bin; ./lmi_wx_shared --data_path=/opt/lmi/data
+  export LMI_COMPILER=gcc ; export LMI_TRIPLET=i686-w64-mingw32 ; . 
./set_toolchain.sh
+  /opt/lmi/bin/lmi_wx_shared --data_path=/opt/lmi/data
 
 You should see lmi's GUI. Try "File | New | Illustration", then press "OK";
 you should see values. Then try "File | Print preview"; you should see an
diff --git a/gui_test.sh b/gui_test.sh
index 211f730..6c2ba03 100755
--- a/gui_test.sh
+++ b/gui_test.sh
@@ -36,15 +36,7 @@ set -e
 # provides no convenient alternative):
 setopt PIPE_FAIL
 
-lmi_build_type=$(/usr/share/libtool/build-aux/config.guess)
-case "$lmi_build_type" in
-    (*-*-linux*)
-        PERFORM=wine
-        ;;
-    (*)
-        PERFORM=
-        ;;
-esac
+. ./set_toolchain.sh
 
 # Lines beginning with a capitalized word, viz.
 #   /^NOTE: starting the test suite$/d
diff --git a/gwc/.zshrc b/gwc/.zshrc
index 4a35a4a..234f5db 100644
--- a/gwc/.zshrc
+++ b/gwc/.zshrc
@@ -3,6 +3,12 @@
 export LMI_COMPILER=gcc
 export LMI_TRIPLET=i686-w64-mingw32
 
+# To work with lmi, it is crucial to source 'set_toolchain.sh'. It's
+# deliberately not sourced here, so that it can assume that some
+# things have already been set up: for instance, it assumes that
+#   /usr/share/libtool/build-aux/config.guess
+# is present, which need not be the case in a brand-new chroot.
+
 # Minimal system path.
 export MINIMAL_PATH="/usr/bin:/bin:/usr/sbin:/sbin"
 export PATH="$MINIMAL_PATH"
diff --git a/nychthemeral_test.sh b/nychthemeral_test.sh
index f127b0d..2d94dcb 100755
--- a/nychthemeral_test.sh
+++ b/nychthemeral_test.sh
@@ -36,15 +36,7 @@ set -e
 # provides no convenient alternative):
 setopt PIPE_FAIL
 
-lmi_build_type=$(/usr/share/libtool/build-aux/config.guess)
-case "$lmi_build_type" in
-    (*-*-linux*)
-        PERFORM=wine
-        ;;
-    (*)
-        PERFORM=
-        ;;
-esac
+. ./set_toolchain.sh
 
 coefficiency=${coefficiency:-"--jobs=$(nproc)"}