Skip to content
This repository has been archived by the owner on Jan 3, 2023. It is now read-only.

Commit

Permalink
Merge pull request #121 from matthid/useRuntimeClrRoot
Browse files Browse the repository at this point in the history
use ClrRoot of current RuntimeEnvironment instead of hardcoded 4.0 on mono
  • Loading branch information
funnelweb committed Mar 29, 2013
2 parents 5276da1 + 60f0946 commit d603cee
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions src/fsharp/build.fs
Expand Up @@ -2437,11 +2437,9 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) =
[] []
#else #else
// When running on Mono we lead everyone to believe we're doing .NET 4.0 compilation // When running on Mono we lead everyone to believe we're doing .NET 4.0 compilation
// by default. // by default. Why? See https://github.com/fsharp/fsharp/issues/99
if runningOnMono then if runningOnMono then
let sysDir = System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory() [System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory()]
let mono40SysDir = Path.Combine(Path.GetDirectoryName sysDir, "4.0")
[mono40SysDir]
else else
try try
match tcConfig.resolutionEnvironment with match tcConfig.resolutionEnvironment with
Expand Down

0 comments on commit d603cee

Please sign in to comment.