Skip to content

Commit

Permalink
Merge branch 'patch' of https://github.com/ncave/visualfsharp into patch
Browse files Browse the repository at this point in the history
  • Loading branch information
ncave committed Aug 24, 2016
2 parents c6fe542 + 24ac4ac commit f23696f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/fsharp/CompileOps.fs
Original file line number Diff line number Diff line change
Expand Up @@ -2565,7 +2565,7 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) =
clrRoot, (int v1, sprintf "v%d.%d" v1 v2), (v1=5us && v2=0us && v3=5us) // SL5 mscorlib is 5.0.5.0
| _ ->
failwith (FSComp.SR.buildCouldNotReadVersionInfoFromMscorlib())
with e ->
with e ->
error(Error(FSComp.SR.buildErrorOpeningBinaryFile(filename, e.Message), rangeStartup))
| _ ->
#if !ENABLE_MONO_SUPPORT
Expand Down Expand Up @@ -2626,7 +2626,7 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) =
checkFSharpBinaryCompatWithMscorlib filename ilReader.ILAssemblyRefs ilReader.ILModuleDef.ManifestOfAssembly.Version rangeStartup;
let fslibRoot = Path.GetDirectoryName(FileSystem.GetFullPathShim(filename))
fslibRoot (* , sprintf "v%d.%d" v1 v2 *)
with e ->
with e ->
error(Error(FSComp.SR.buildErrorOpeningBinaryFile(filename, e.Message), rangeStartup))
| _ ->
data.defaultFSharpBinariesDir
Expand Down

0 comments on commit f23696f

Please sign in to comment.