diff options
| author | therzok <marius.ungureanu@xamarin.com> | 2019-10-12 03:27:19 +0300 |
|---|---|---|
| committer | therzok <marius.ungureanu@xamarin.com> | 2019-10-18 17:38:05 +0300 |
| commit | d1691adb189e5954291b80cce387c37152ca2bf0 (patch) | |
| tree | e1258c94e6ceb2a6d1ca1076873c06be035aedb4 /main/build | |
| parent | 248b26c41fa13887a591025dcf061b8f86341742 (diff) | |
Get rid of 64bit toggle from mac config
Diffstat (limited to 'main/build')
| -rw-r--r-- | main/build/MacOSX/Makefile.am | 10 | ||||
| -rw-r--r-- | main/build/MacOSX/monostub-test.m | 4 | ||||
| -rw-r--r-- | main/build/MacOSX/monostub-utils.h | 3 |
3 files changed, 5 insertions, 12 deletions
diff --git a/main/build/MacOSX/Makefile.am b/main/build/MacOSX/Makefile.am index d5376015c1..4757765aa1 100644 --- a/main/build/MacOSX/Makefile.am +++ b/main/build/MacOSX/Makefile.am @@ -49,23 +49,23 @@ dmg: render.exe app ./make-dmg-bundle.sh monostub.o: monostub.mm $(MONOSTUB_EXTRA_SOURCEFILES) - g++ -g $(HYBRID_SUSPEND_ABORT) -c -Wall -m$(MONOSTUB_ARCH) -o $@ monostub.mm + g++ -g $(HYBRID_SUSPEND_ABORT) -c -Wall -m64 -o $@ monostub.mm monostub-nogui.o: monostub.mm $(MONOSTUB_EXTRA_SOURCEFILES) - g++ -g $(HYBRID_SUSPEND_ABORT) -DNOGUI -c -Wall -m$(MONOSTUB_ARCH) -o $@ monostub.mm + g++ -g $(HYBRID_SUSPEND_ABORT) -DNOGUI -c -Wall -m64 -o $@ monostub.mm monostub: monostub.o $(MONOSTUB_STATIC_LINK) - clang++ -g -Wall -m$(MONOSTUB_ARCH) -o $@ -Wl,-all_load $^ -framework AppKit -framework Quartz -undefined dynamic_lookup $(MONOSTUB_RPATH) + clang++ -g -Wall -m64 -o $@ -Wl,-all_load $^ -framework AppKit -framework Quartz -undefined dynamic_lookup $(MONOSTUB_RPATH) mkdir -p ../bin cp $@ ../bin/MonoDevelop monostub-nogui: monostub-nogui.o $(MONOSTUB_STATIC_LINK) - clang++ -g -Wall -m$(MONOSTUB_ARCH) -o $@ -Wl,-all_load $^ -framework AppKit -framework Quartz -undefined dynamic_lookup $(MONOSTUB_RPATH) + clang++ -g -Wall -m64 -o $@ -Wl,-all_load $^ -framework AppKit -framework Quartz -undefined dynamic_lookup $(MONOSTUB_RPATH) mkdir -p ../bin cp $@ ../bin/mdtool monostub-test: monostub-test.m $(MONOSTUB_EXTRA_SOURCEFILES) - gcc -g -Wall -m$(MONOSTUB_ARCH) -o $@ monostub-test.m -framework AppKit + gcc -g -Wall -m64 -o $@ monostub-test.m -framework AppKit ./monostub-test clean-local: diff --git a/main/build/MacOSX/monostub-test.m b/main/build/MacOSX/monostub-test.m index 970c1c7267..7dfa0a7d8f 100644 --- a/main/build/MacOSX/monostub-test.m +++ b/main/build/MacOSX/monostub-test.m @@ -145,9 +145,6 @@ void test_update_environment(void) const char *gac_components[] = { [resourcePath UTF8String], }; - const char *safe_components[] = { - "yes", - }; const char *numeric_components[] = { "C", }; @@ -161,7 +158,6 @@ void test_update_environment(void) check_path_has_components(getenv("PATH"), path_components, sizeof(path_components) / sizeof(char *)); check_path_has_components(getenv("PKG_CONFIG_PATH"), pkg_components, sizeof(pkg_components) / sizeof(char *)); check_path_has_components(getenv("MONO_GAC_PREFIX"), gac_components, sizeof(gac_components) / sizeof(char *)); - check_path_has_components(getenv("MONODEVELOP_64BIT_SAFE"), safe_components, sizeof(safe_components) / sizeof (char *)); check_path_has_components(getenv("LC_NUMERIC"), numeric_components, sizeof(numeric_components) / sizeof(char *)); } diff --git a/main/build/MacOSX/monostub-utils.h b/main/build/MacOSX/monostub-utils.h index 309d982ffe..f9b7da42ce 100644 --- a/main/build/MacOSX/monostub-utils.h +++ b/main/build/MacOSX/monostub-utils.h @@ -188,9 +188,6 @@ update_environment (NSString *binDir) if (push_env_to_end ("PATH", "~/.dotnet/tools")) updated = YES; - if (replace_env ("MONODEVELOP_64BIT_SAFE", "yes")) - updated = YES; - if (replace_env ("LC_NUMERIC", "C")) updated = YES; |