diff options
| author | iain holmes <iain@xamarin.com> | 2015-10-22 15:27:38 +0300 |
|---|---|---|
| committer | iain holmes <iain@xamarin.com> | 2015-10-30 15:37:51 +0300 |
| commit | e2a40479b6f954d71c11c22ea3126024936bcb80 (patch) | |
| tree | 78775247c1574c7374a435445add59cf3db64ca3 | |
| parent | baf802038a7f64565ae7de3606c625f561373e4c (diff) | |
[Build] Build monostub for the correct architecture
| -rw-r--r-- | main/build/MacOSX/Makefile.am | 6 | ||||
| -rw-r--r-- | main/configure.in | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/main/build/MacOSX/Makefile.am b/main/build/MacOSX/Makefile.am index 200d79fe08..c27a4eb1ce 100644 --- a/main/build/MacOSX/Makefile.am +++ b/main/build/MacOSX/Makefile.am @@ -31,12 +31,12 @@ dmg: render.exe app ./make-dmg-bundle.sh monostub: monostub.m $(MONOSTUB_EXTRA_SOURCES) - gcc -Wall -mmacosx-version-min=10.10 -m32 -o $@ $^ -framework AppKit -# gcc -Wall -mmacosx-version-min=10.10 -m32 -o $@ $^ -framework AppKit -isysroot $(SDK_PATH) + gcc -Wall -mmacosx-version-min=10.10 -m$(MONOSTUB_ARCH) -o $@ $^ -framework AppKit +# gcc -Wall -mmacosx-version-min=10.10 -m$(MONOSTUB_ARCH) -o $@ $^ -framework AppKit -isysroot $(SDK_PATH) cp monostub ../bin/MonoDevelop monostub-test: monostub-test.m $(MONOSTUB_EXTRA_SOURCES) - gcc -g -Wall -mmacosx-version-min=10.10 -m32 -o $@ $^ -framework AppKit + gcc -g -Wall -mmacosx-version-min=10.10 -m$(MONOSTUB_ARCH) -o $@ $^ -framework AppKit ./monostub-test clean-local: diff --git a/main/configure.in b/main/configure.in index 325b29d751..30d7287526 100644 --- a/main/configure.in +++ b/main/configure.in @@ -228,10 +228,13 @@ AC_ARG_WITH(macarch, with_macarch=${withval}, with_macarch=$default_macarch) SGEN_SUFFIX= +MONOSTUB_ARCH=32 if test x$with_macarch = xx86_64; then SGEN_SUFFIX=64 + MONOSTUB_ARCH=64 fi AC_SUBST(SGEN_SUFFIX) +AC_SUBST(MONOSTUB_ARCH) MAC_ARCHITECTURE=${with_macarch} AC_SUBST(MAC_ARCHITECTURE) |