diff options
| author | Matt Ward <matt.ward@xamarin.com> | 2015-11-18 19:23:16 +0300 |
|---|---|---|
| committer | Matt Ward <matt.ward@xamarin.com> | 2015-11-18 19:23:16 +0300 |
| commit | 152d962f35bfc6936271986df255ba8ba9946f68 (patch) | |
| tree | 6e5edbee00ec3c85bdf2d4539925a0bf8b15fb2e /main/configure.in | |
| parent | af51bbb30194855aa36c3df9986f128c41264610 (diff) | |
| parent | 2024e458f430c67a0aaaf9250911871a7a636f89 (diff) | |
Merge branch 'master' into roslyn
Conflicts:
main/build/MacOSX/monostub-test.m
main/build/MacOSX/monostub-utils.h
main/src/addins/MonoDevelop.Refactoring/MonoDevelop.AnalysisCore/AnalysisCommands.cs
main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor.OptionPanels/HighlightingPanel.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Components.MainToolbar/SearchInSolutionSearchCategory.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Components/FileEntry.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Commands/FileCommands.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Pads/ErrorListPad.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/Document.cs
main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/ProjectOperations.cs
version-checks
Diffstat (limited to 'main/configure.in')
| -rw-r--r-- | main/configure.in | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/main/configure.in b/main/configure.in index 30d7287526..a0e8667138 100644 --- a/main/configure.in +++ b/main/configure.in @@ -39,12 +39,17 @@ if ! $PKG_CONFIG --atleast-version=$MONO_REQUIRED_VERSION mono; then AC_MSG_ERROR([You need mono $MONO_REQUIRED_VERSION or newer]) fi -#ensure we have the same env as when configured -AC_SUBST(PATH) -AC_SUBST(PKG_CONFIG_PATH) -AC_SUBST(LD_LIBRARY_PATH) -AC_SUBST(DYLD_FALLBACK_LIBRARY_PATH) -AC_SUBST(MONO_GAC_PREFIX) +### +# Disable the environment capturing as it breaks on El Capitan and we end up storing empty env vars +# which means we break things like `DYLD_FALLBACK_LIBRARY_PATH` because that env has a default meaning +# when it is *not set*, but this code causes it to be set to an empty value so we can't load libc. +### +##ensure we have the same env as when configured +#AC_SUBST(PATH) +#AC_SUBST(PKG_CONFIG_PATH) +#AC_SUBST(LD_LIBRARY_PATH) +#AC_SUBST(DYLD_FALLBACK_LIBRARY_PATH) +#AC_SUBST(MONO_GAC_PREFIX) default_gnomeplatform=no default_windowsplatform=no |