diff options
| author | Alan McGovern <alan@xamarin.com> | 2015-11-16 14:04:34 +0300 |
|---|---|---|
| committer | Alan McGovern <alan@xamarin.com> | 2015-11-16 16:06:01 +0300 |
| commit | 753d1c5d92caef286dc029ed5b8294ffbab5febb (patch) | |
| tree | ac3d1df774cf64ab0fc8ca9a469e331228829a70 /main/configure.in | |
| parent | c83bc671f4ea5c057df457b170c4a455eeabdd4f (diff) | |
[build] Do not try to capture the environment during configure
El Capitan breaks the propagation of DYLD_ env vars through shells,
so our previous method of propagating, storing and using env vars
resulted in us storing empty env vars, which broke things.
Simplest fix is to just remove the code which captured the environment.
Anyone who wants a custom environment can just ensure they consistently
export whatever env vars is is they need.
Allows our tests to run on el capitan.
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 aeadc95918..9072e378d2 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 |