X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FMicrosoft.Build.Engine%2FMicrosoft.Build.BuildEngine%2FImport.cs;h=9088babcfecf8444dc178ef46234374432af271f;hb=e5fb257d8bf0b3dae7e404a5839b550bee78d685;hp=e77209c2caa5802d9149770f7f9b9a7d275f3bcd;hpb=db7a1da9bf6f27050495915b2e109a99e4d88279;p=mono.git diff --git a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Import.cs b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Import.cs index e77209c2caa..9088babcfec 100644 --- a/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Import.cs +++ b/mcs/class/Microsoft.Build.Engine/Microsoft.Build.BuildEngine/Import.cs @@ -120,10 +120,10 @@ namespace Microsoft.Build.BuildEngine { string envvar = Environment.GetEnvironmentVariable (property_name); envvar = String.Join (":", new string [] { + (envvar ?? String.Empty), // For mac osx, look in the 'External' dir on macosx, // see bug #663180 MSBuildUtils.RunningOnMac ? MacOSXExternalXBuildDir : String.Empty, - (envvar ?? String.Empty), DotConfigExtensionsPath}); string [] paths = envvar.Split (new char [] {':'}, StringSplitOptions.RemoveEmptyEntries);