NotificationsYou must be signed in to change notification settings
Fork0
Star0

Commite2ea101

committed

fix build of coreclr

1 parentbcbde2c commite2ea101Copy full SHA for e2ea101

File tree

2 files changed

-1

lines changed

src/fsharp
- CompileOps.fs
- fsi
  - fsi.fs

2 files changed

-1

lines changed

`‎src/fsharp/CompileOps.fs‎`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2809,7 +2809,11 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) =`
`2809`	`2809`	`yield tcConfig.MakePathAbsolute x`
`2810`	`2810`
`2811`	`2811`	`\| None->`
	`2812`	`+#if FSI_TODO_NETCORE// there is no really good notion of runtime directory on .NETCore`
	`2813`	`+letruntimeRoot= Path.GetDirectoryName(typeof<System.Object>.Assembly.Location)`
	`2814`	`+#else`
`2812`	`2815`	`letruntimeRoot= System.Runtime.InteropServices.RuntimeEnvironment.GetRuntimeDirectory()`
	`2816`	`+#endif`
`2813`	`2817`	`letruntimeRootWithoutSlash= runtimeRoot.TrimEnd('/','\\')`
`2814`	`2818`	`letruntimeRootFacades= Path.Combine(runtimeRootWithoutSlash,"Facades")`
`2815`	`2819`	`letruntimeRootWPF= Path.Combine(runtimeRootWithoutSlash,"WPF")`
`@@ -2826,6 +2830,7 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) =`
`2826`	`2830`	`yield runtimeRootWPF// PresentationCore.dll is in C:\Windows\Microsoft.NET\Framework\v4.0.30319\WPF`
`2827`	`2831`
`2828`	`2832`	`\| ResolutionEnvironment.EditingOrCompilation_->`
	`2833`	`+#if ENABLE_MONO_SUPPORT`
`2829`	`2834`	`if runningOnMonothen`
`2830`	`2835`	`// Default compilation-time references on Mono`
`2831`	`2836`	`//`
`@@ -2844,6 +2849,7 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) =`
`2844`	`2849`	`if Directory.Exists(runtimeRootApiFacades)then`
`2845`	`2850`	`yield runtimeRootApiFacades`
`2846`	`2851`	`else`
	`2852`	`+#endif`
`2847`	`2853`	`// Default compilation-time references on .NET Framework`
`2848`	`2854`	`//`
`2849`	`2855`	`// This is the normal case for "fsc.exe a.fs". We refer to the reference assemblies folder.`

`‎src/fsharp/fsi/fsi.fs‎`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ open Microsoft.FSharp.Compiler.Tast`
`48`	`48`	`openMicrosoft.FSharp.Compiler.Tastops`
`49`	`49`	`openMicrosoft.FSharp.Compiler.TcGlobals`
`50`	`50`	`openMicrosoft.FSharp.Compiler.SourceCodeServices`
	`51`	`+openMicrosoft.FSharp.Compiler.ReferenceResolver`
`51`	`52`
`52`	`53`	`openInternal.Utilities`
`53`	`54`	`openInternal.Utilities.Collections`
`@@ -2459,7 +2460,7 @@ type FsiEvaluationSession (fsi: FsiEvaluationSessionHostConfig, argv:string[], i`
`2459`	`2460`
`2460`	`2461`	`lettcConfigB= TcConfigBuilder.CreateNew(legacyReferenceResolver, defaultFSharpBinariesDir=defaultFSharpBinariesDir, optimizeForMemory=true, implicitIncludeDir=currentDirectory, isInteractive=true, isInvalidationSupported=false, defaultCopyFSharpCore=false)`
`2461`	`2462`	`lettcConfigP= TcConfigProvider.BasedOnMutableBuilder(tcConfigB)`
`2462`		`-do tcConfigB.resolutionEnvironment<-ReferenceResolver.ResolutionEnvironment.CompilationAndEvaluation// See Bug 3608`
	`2463`	`+do tcConfigB.resolutionEnvironment<- ResolutionEnvironment.CompilationAndEvaluation// See Bug 3608`
`2463`	`2464`	`do tcConfigB.useFsiAuxLib<- fsi.UseFsiAuxLib`
`2464`	`2465`
`2465`	`2466`	`#if FSI_TODO_NETCORE`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commite2ea101

File tree

2 files changed

2 files changed

`‎src/fsharp/CompileOps.fs‎`

`‎src/fsharp/fsi/fsi.fs‎`

0 commit comments