Mercurial > mxe-octave

changeset 3180:803d75af88ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Set native build options using configure definitions * tools/set_mxe_env.sh.in: use the config.guess name for the host, set the pkgconfig exe extension based on EXEEXT.
author John Donoghue <john.donoghue@ieee.org>
date Thu, 25 Jul 2013 21:29:53 -0400
parents 90341dd4590e
children b89f8cfeff8e
files tools/set_mxe_env.sh.in
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tools/set_mxe_env.sh.in	Thu Jul 25 20:04:17 2013 -0400
+++ b/tools/set_mxe_env.sh.in	Thu Jul 25 21:29:53 2013 -0400
@@ -1,6 +1,6 @@
 #!/bin/bash
 MXEDIR=@MXE_ROOTDIR@
-HOST=i686-pc-mingw32
+HOST=$($MXEDIR/tools/config.guess)
 
 if [ -z "$MXE_OCTAVE_ENV" ]; then
 
@@ -9,7 +9,7 @@
 export LDFLAGS="-L$MXEDIR/usr/$HOST/lib"
 export LD_LIBRARY_PATH="$MXEDIR/usr/$HOST/lib:$LD_LIBRARY_PATH"
 export PKG_CONFIG_PATH="$MXEDIR/usr/$HOST/lib/pkgconfig"
-export PKG_CONFIG="$MXEDIR/usr/bin/pkg-config.exe"
+export PKG_CONFIG="$MXEDIR/usr/bin/pkg-config@EXEEXT@"
 
 export MXE_OCTAVE_ENV=$MXEDIR