[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] master 3b60273 1/5: Transpose triplets
From: |
Greg Chicares |
Subject: |
[lmi-commits] [lmi] master 3b60273 1/5: Transpose triplets |
Date: |
Mon, 26 Oct 2020 16:27:18 -0400 (EDT) |
branch: master
commit 3b60273cfe6f9a041f00456ffb679f474608068f
Author: Gregory W. Chicares <gchicares@sbcglobal.net>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>
Transpose triplets
Debugging is much easier with the native architecture, so generally
prefer to write it first. The order matters elsewhere, e.g., where
multiple architectures are built; do it here for concinnity.
---
set_toolchain.sh | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/set_toolchain.sh b/set_toolchain.sh
index de4e8d4..618c100 100755
--- a/set_toolchain.sh
+++ b/set_toolchain.sh
@@ -27,9 +27,9 @@
# used in production if they were unset or null beforehand. They can
# be overridden at the command line, e.g.:
#
+# LMI_COMPILER=gcc ; LMI_TRIPLET=x86_64-pc-linux-gnu ; .
/opt/lmi/src/lmi/set_toolchain.sh
# LMI_COMPILER=gcc ; LMI_TRIPLET=i686-w64-mingw32 ; .
/opt/lmi/src/lmi/set_toolchain.sh
# LMI_COMPILER=gcc ; LMI_TRIPLET=x86_64-w64-mingw32 ; .
/opt/lmi/src/lmi/set_toolchain.sh
-# LMI_COMPILER=gcc ; LMI_TRIPLET=x86_64-pc-linux-gnu ; .
/opt/lmi/src/lmi/set_toolchain.sh
#
# Implemented as a function that runs and then erases itself, so that
# sourcing this script changes the environment only as intended. This
@@ -61,8 +61,8 @@
#
# Supported values:
# LMI_COMPILER : gcc, clang
-# LMI_TRIPLET : i686-w64-mingw32, x86_64-w64-mingw32, x86_64-pc-linux-gnu
-# (clang and pc-linux-gnu are not yet tested).
+# LMI_TRIPLET : x86_64-pc-linux-gnu, i686-w64-mingw32, x86_64-w64-mingw32
+# (clang not yet tested).
#
# Examples:
#
@@ -126,12 +126,6 @@ export PERFORM
case "$lmi_build_type" in
(*-*-linux*)
case "$LMI_TRIPLET" in
- (*-*-mingw32)
- w0="$(winepath -w "$localbindir" | sed -e's/\\/\\\\/g')"
- w1="$(winepath -w "$locallibdir" | sed -e's/\\/\\\\/g')"
- export WINEPATH="$w0;$w1"
- export PERFORM="wine"
- ;;
(x86_64-pc-linux-gnu)
# Using LD_LIBRARY_PATH is not ideal, but it does work.
export LD_LIBRARY_PATH
@@ -139,6 +133,12 @@ case "$lmi_build_type" in
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$locallibdir"
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$bindir"
;;
+ (*-*-mingw32)
+ w0="$(winepath -w "$localbindir" | sed -e's/\\/\\\\/g')"
+ w1="$(winepath -w "$locallibdir" | sed -e's/\\/\\\\/g')"
+ export WINEPATH="$w0;$w1"
+ export PERFORM="wine"
+ ;;
esac
;;
(*) ;;
@@ -162,9 +162,9 @@ case "$LMI_COMPILER" in
esac
case "$LMI_TRIPLET" in
+ (x86_64-pc-linux-gnu) ;;
(i686-w64-mingw32) ;;
(x86_64-w64-mingw32) ;;
- (x86_64-pc-linux-gnu) ;;
(*)
printf '%s\n' "Changed nothing because host triplet '$LMI_TRIPLET' is
untested."
return 3;