diff options
| author | James Bellinger <jfb@zer7.com> | 2012-06-24 23:40:36 +0400 |
|---|---|---|
| committer | James Bellinger <jfb@zer7.com> | 2012-06-24 23:43:14 +0400 |
| commit | 229b363ef861ab9456f8bdc428c550e2241688e9 (patch) | |
| tree | 33f31ea9e16e440e1be9d6cc8c4cb4a41a8e21c2 /build-mingw32.sh | |
| parent | 3d43cfdfccc1aa699e599c39f91fb41231304da9 (diff) | |
(1) Made build-mingw32.sh build .NET 4.5 as well.
(2) Fixed the version extraction for build-mingw32.sh. It extracted from the wrong line for current configure.in.
(3) configure.in added a line for Clang for the Windows cross-compile just like the Android cross-compile has.
It can't do the automatic check due to being a cross-compile so manually adding the line makes it possible
to build. Like Android, if you want to use Clang for the cross-compile, you have to manually set the
variable to 'yes'.
Summary: With these changes, build-mingw32.sh works nicely and I've successfully built Windows Mono on Debian 6.
Changelog suggests it may not have been touched/used in a while, so this is an un-break patch.
Diffstat (limited to 'build-mingw32.sh')
| -rwxr-xr-x | build-mingw32.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build-mingw32.sh b/build-mingw32.sh index 16fc66fa923..8bcb5ff973c 100755 --- a/build-mingw32.sh +++ b/build-mingw32.sh @@ -4,7 +4,7 @@ MINGW=i386-mingw32msvc CROSS_DIR=/opt/cross/$MINGW EXTRA_CROSS_DIR= INSTALL_DESTDIR="$CURDIR/mono-win32" -PROFILES="default net_2_0 net_3_5 net_4_0 moonlight" +PROFILES="default net_2_0 net_3_5 net_4_0 net_4_5 moonlight" TEMPORARY_PKG_CONFIG_DIR=/tmp/$RANDOM-pkg-config-$RANDOM ORIGINAL_PATH="$PATH" @@ -57,7 +57,7 @@ function setup () CROSS_DLL_DIR="$CROSS_DIR/bin" PATH=$CROSS_BIN_DIR:$PATH - MONO_VERSION=`grep AM_INIT_AUTOMAKE configure.in | cut -d ',' -f 2|tr -d '\)'|tr -d '\('` + MONO_VERSION=`grep AC_INIT configure.in | cut -d ',' -f 2|tr -d '\[ \]'` if [ -d ./.git ]; then MONO_GIT_COMMIT="`git log -1 --format=format:%t`" |