Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/Compiler/Driver/StaticLinking.fs
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,9 @@ type TypeForwarding(tcImports: TcImports) =

member _.TypeForwardILTypeRef tref = typeForwardILTypeRef tref

#if !NO_TYPEPROVIDERS
let debugStaticLinking = isEnvVarSet "FSHARP_DEBUG_STATIC_LINKING"
#endif

let StaticLinkILModules
(
Expand Down Expand Up @@ -419,6 +421,7 @@ let FindDependentILModulesForStaticLinking (ctok, tcConfig: TcConfig, tcImports:
(n.ccu, n.data)
]

#if !NO_TYPEPROVIDERS
// Add all provider-generated assemblies into the static linking set
let FindProviderGeneratedILModules (ctok, tcImports: TcImports, providerGeneratedAssemblies: (ImportedBinary * _) list) =
[
Expand All @@ -442,6 +445,7 @@ let FindProviderGeneratedILModules (ctok, tcImports: TcImports, providerGenerate
(ccu, dllInfo.ILScopeRef, modul), (ilAssemRef.Name, provAssemStaticLinkInfo)
| None -> ()
]
#endif

/// Split the list into left, middle and right parts at the first element satisfying 'p'. If no element matches return
/// 'None' for the middle part.
Expand Down
2 changes: 2 additions & 0 deletions src/Compiler/TypedTree/TypedTreePickle.fs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ open FSharp.Compiler.TypedTreeBasics
open FSharp.Compiler.TypedTreeOps
open FSharp.Compiler.TcGlobals

#if !NO_TYPEPROVIDERS
let verbose = false
#endif

let ffailwith fileName str =
let msg = FSComp.SR.pickleErrorReadingWritingMetadata(fileName, str)
Expand Down