[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[lmi-commits] [lmi] master fa7d611 2/2: Add native build

From: Greg Chicares
Subject: [lmi-commits] [lmi] master fa7d611 2/2: Add native build
Date: Sun, 11 Oct 2020 21:06:07 -0400 (EDT)

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

    Add native build
    This makes 'install_msw.sh' a bit of a misnomer.
 install_msw.sh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/install_msw.sh b/install_msw.sh
index 4da021d..dcc11ef 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -247,11 +247,16 @@ make "$coefficiency" --output-sync=recurse -f 
 # This for-loop can iterate over as many toolchains as desired.
 # Make sure the current production architecture is built last, so that
 # it's the one installed to /opt/lmi/bin/ when this script ends.
+triplets="x86_64-w64-mingw32 i686-w64-mingw32"
+if [ "Cygwin" != "$platform" ] && [ "WSL" != "$platform" ]
+    triplets="x86_64-pc-linux-gnu x86_64-w64-mingw32 i686-w64-mingw32"
 export LMI_COMPILER=gcc
 # shellcheck disable=SC2043
 #for LMI_TRIPLET in i686-w64-mingw32 ;
-for LMI_TRIPLET in x86_64-w64-mingw32 i686-w64-mingw32 ;
+for LMI_TRIPLET in ${triplets} ;
     # Set a minimal path for makefiles and scripts that are
     # designed to be independent of lmi's runtime path.
@@ -280,6 +285,12 @@ do
     # Source this script only for commands that depend upon it.
     . ./set_toolchain.sh
+    # For pc-linux-gnu, this is not ideal, but it does work.
+    export LD_LIBRARY_PATH
+    LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/lmi/local/"gcc_${LMI_TRIPLET}"/lib
     make "$coefficiency" --output-sync=recurse wx_config_check
     make "$coefficiency" --output-sync=recurse show_flags
     make "$coefficiency" --output-sync=recurse clean

reply via email to

[Prev in Thread] Current Thread [Next in Thread]