r16180 - gnucash/trunk/packaging/win32 - Install.sh: Use ld, gcc, dlltool and ranlib for cross-compiling.
Andreas Köhler
andi5 at cvs.gnucash.org
Mon Jun 18 16:42:22 EDT 2007
Author: andi5
Date: 2007-06-18 16:42:19 -0400 (Mon, 18 Jun 2007)
New Revision: 16180
Trac: http://svn.gnucash.org/trac/changeset/16180
Modified:
gnucash/trunk/packaging/win32/defaults.sh
gnucash/trunk/packaging/win32/install.sh
Log:
Install.sh: Use ld, gcc, dlltool and ranlib for cross-compiling.
Add $_MINGW_UDIR/mingw32/bin to PATH and use gcc (and friends) instead
of mingw32-gcc. Also make sure PKG_CONFIG_PATH and PKG_CONFIG_LIBDIR
are exported to avoid using the build machine's installed packages.
Modified: gnucash/trunk/packaging/win32/defaults.sh
===================================================================
--- gnucash/trunk/packaging/win32/defaults.sh 2007-06-18 20:42:15 UTC (rev 16179)
+++ gnucash/trunk/packaging/win32/defaults.sh 2007-06-18 20:42:19 UTC (rev 16180)
@@ -68,21 +68,20 @@
####
+set_default LD ld
+set_default CC gcc
+set_default DLLTOOL dlltool
+set_default RANLIB ranlib
+
# For cross-compiling, change this to "yes"
set_default CROSS_COMPILE "no"
if [ "$CROSS_COMPILE" != yes ]; then
set_default LIBTOOLIZE libtoolize
- set_default LD ld
- set_default CC gcc
- set_default DLLTOOL dlltool
else
# Insert your cross-compiler mingw32 bin-directories here
set_default LIBTOOLIZE $GLOBAL_DIR/autotools/bin/libtoolize
set_default HOST_XCOMPILE "--host=mingw32"
- set_default LD mingw32-ld
- set_default CC mingw32-gcc
- set_default DLLTOOL mingw32-dlltool
fi
####
Modified: gnucash/trunk/packaging/win32/install.sh
===================================================================
--- gnucash/trunk/packaging/win32/install.sh 2007-06-18 20:42:15 UTC (rev 16179)
+++ gnucash/trunk/packaging/win32/install.sh 2007-06-18 20:42:19 UTC (rev 16180)
@@ -73,9 +73,9 @@
fi
if [ "$CROSS_COMPILE" ]; then
- # to avoid using the host's installed packages
- PKG_CONFIG_PATH=""
- PKG_CONFIG_LIBDIR=""
+ # to avoid using the build machine's installed packages
+ export PKG_CONFIG_PATH=""
+ export PKG_CONFIG_LIBDIR=""
fi
}
@@ -129,6 +129,7 @@
setup MinGW
_MINGW_UDIR=`unix_path $MINGW_DIR`
_MINGW_WFSDIR=`win_fs_path $MINGW_DIR`
+ [ "$CROSS_COMPILE" = "yes" ] && add_to_env $_MINGW_UDIR/mingw32/bin PATH
[ "$CROSS_COMPILE" = "yes" ] && add_to_env $_MINGW_UDIR/bin PATH
if quiet test_for_mingw
More information about the gnucash-changes
mailing list