lmi-commits
[Top][All Lists]
Advanced

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

[lmi-commits] [lmi] master 6164366 02/14: Fix configuring wxPdfDoc under


From: Greg Chicares
Subject: [lmi-commits] [lmi] master 6164366 02/14: Fix configuring wxPdfDoc under Linux
Date: Sat, 10 Oct 2020 11:07:11 -0400 (EDT)

branch: master
commit 6164366999d76baa22712a02a45730c56c96aa36
Author: Ilya Sinitsyn <isinitsyn@tt-solutions.com>
Commit: Gregory W. Chicares <gchicares@sbcglobal.net>

    Fix configuring wxPdfDoc under Linux
    
    Don't pass host and build parameters to wxWidgets configure script when
    not cross-compiling, this is unnecessary and can actually be harmful as
    it exposes some latent bugs in wx-config.
---
 install_wxpdfdoc.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/install_wxpdfdoc.sh b/install_wxpdfdoc.sh
index c3a11a0..9befa92 100755
--- a/install_wxpdfdoc.sh
+++ b/install_wxpdfdoc.sh
@@ -62,11 +62,19 @@ config_options="
   --exec-prefix=$exec_prefix
   --with-wx-prefix=$prefix
   --with-wx-exec-prefix=$exec_prefix
-  --build=$build_type
-  --host=$LMI_TRIPLET
   --disable-dependency-tracking
 "
 
+# Provide the host and the build type only when cross-compiling.
+if [ "$LMI_TRIPLET" != "$build_type" ]
+then
+    config_options="
+      $config_options
+      --build=$build_type
+      --host=$LMI_TRIPLET
+    "
+fi
+
 [ -n "$mingw_bin_dir" ] && export PATH="$mingw_bin_dir:${PATH}"
 
 cd "$wxpdfdoc_dir"



reply via email to

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