[lmi-commits] [lmi] master 6b5f5b2 4/6: Rely on 'set_toolchain.sh' to set $LMI_COMPILER and $LMI_TRIPLET

[Greg Chicares]

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

    Rely on 'set_toolchain.sh' to set $LMI_COMPILER and $LMI_TRIPLET
---
 GNUmakefile           | 30 +++++++++++++++---------------
 INSTALL               |  2 +-
 gwc/.zshrc            |  3 ---
 tabs/5/startup_script |  2 +-
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index e1a1e69..86664a5 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -77,6 +77,20 @@ MAKEFLAGS := \
 
 
################################################################################
 
+# Remake this file to "source" a script that sets various crucial
+# environment variables.
+
+export LMI_ENV_FILE := env_$(shell date -u +'%s_%N').eraseme
+
+GNUmakefile $(srcdir)/GNUmakefile:: $(LMI_ENV_FILE)
+       $(eval include $(LMI_ENV_FILE))
+       @rm $(LMI_ENV_FILE)
+
+$(LMI_ENV_FILE):
+       @. ./set_toolchain.sh
+
+################################################################################
+
 # Directories.
 
 # SOMEDAY !! Follow the GNU Coding Standards
@@ -84,9 +98,6 @@ MAKEFLAGS := \
 # more closely, changing the value of $(datadir), and perhaps using
 # some other standard directories that are commented out for now.
 
-LMI_COMPILER ?= gcc
-LMI_TRIPLET  ?= i686-w64-mingw32
-
 prefix          := /opt/lmi
 # parent directory for machine-specific binaries
 exec_prefix     := $(prefix)/$(LMI_COMPILER)_$(LMI_TRIPLET)
@@ -131,18 +142,7 @@ touchstone_dir  := $(prefix)/touchstone
 
################################################################################
 
 # Other makefiles included; makefiles not to be remade.
-
-# Remake this file to "source" a script.
-
-export LMI_ENV_FILE := env_$(shell date -u +'%s_%N').eraseme
-
-GNUmakefile $(srcdir)/GNUmakefile:: $(LMI_ENV_FILE)
-       $(eval include $(LMI_ENV_FILE))
-       @rm $(LMI_ENV_FILE)
-
-$(LMI_ENV_FILE):
-       @. ./set_toolchain.sh
-
+#
 # Included files that don't need to be remade are given explicit empty
 # commands, which significantly reduces the number of lines emitted by
 # 'make -d', making debug output easier to read.
diff --git a/INSTALL b/INSTALL
index 9fd3413..98c39c3 100644
--- a/INSTALL
+++ b/INSTALL
@@ -79,7 +79,7 @@ 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 LMI_COMPILER=gcc ; export LMI_TRIPLET=i686-w64-mingw32 ; . 
./set_toolchain.sh
+  . /opt/lmi/src/lmi/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";
diff --git a/gwc/.zshrc b/gwc/.zshrc
index 234f5db..afe8af7 100644
--- a/gwc/.zshrc
+++ b/gwc/.zshrc
@@ -1,8 +1,5 @@
 # Personal configuration for cross-building in a chroot.
 
-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
diff --git a/tabs/5/startup_script b/tabs/5/startup_script
index 6a7c559..86c2b5b 100755
--- a/tabs/5/startup_script
+++ b/tabs/5/startup_script
@@ -3,7 +3,7 @@
 a='schroot --chroot=cross-lmi'
 
 b='cd /opt/lmi/bin'
-c='LMI_COMPILER=gcc ; LMI_TRIPLET=i686-w64-mingw32 ; . 
/opt/lmi/src/lmi/set_toolchain.sh'
+c='. /opt/lmi/src/lmi/set_toolchain.sh'
 d='wine ./lmi_wx_shared --ash_nazg --data_path=/opt/lmi/data'
 e='/opt/lmi/src/lmi/gui_test.sh'