From ae6ca685e7a1e8a37d51d5aa5b422083fed77ffe Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Mon, 5 Mar 2018 08:40:15 +0100 Subject: [PATCH] Only use --nocopyfsharpcore with VS 2017 (#600) --- makefiles/Makefile.fsharp.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/makefiles/Makefile.fsharp.mk b/makefiles/Makefile.fsharp.mk index 1903dbdeaf..7ae33c2d3a 100644 --- a/makefiles/Makefile.fsharp.mk +++ b/makefiles/Makefile.fsharp.mk @@ -33,10 +33,16 @@ ifdef CLR_KEYFILE FS_SIGNING_FLAGS := $(FLAG_PREFIX)keyfile:$(CLR_KEYFILE) endif +ifeq ("$(VisualStudioVersion)", "15.0") +FS_NOCPYCORE := $(FLAG_PREFIX)nocopyfsharpcore +else +FS_NOCPYCORE := +endif + .PHONY: fsharp # Build F# OR-Tools. Set environment variable FSHARP_DEBUG=1 for debug symbols. fsharp: csharp ifneq ($(FSHARP_EXECUTABLE),) - "$(FSHARP_EXECUTABLE)" $(FLAG_PREFIX)target:library $(FLAG_PREFIX)out:bin$S$(FSHARP_ORTOOLS_DLL_NAME).dll $(FLAG_PREFIX)platform:anycpu $(FLAG_PREFIX)nocopyfsharpcore $(FLAG_PREFIX)lib:bin $(FLAG_PREFIX)reference:$(BASE_ORTOOLS_DLL_NAME).dll $(FSHARP_DEBUG) $(FS_SIGNING_FLAGS) ortools$Sfsharp$S$(FSHARP_ORTOOLS_DLL_NAME).fsx + "$(FSHARP_EXECUTABLE)" $(FLAG_PREFIX)target:library $(FLAG_PREFIX)out:bin$S$(FSHARP_ORTOOLS_DLL_NAME).dll $(FLAG_PREFIX)platform:anycpu $(FS_NOCPYCORE) $(FLAG_PREFIX)lib:bin $(FLAG_PREFIX)reference:$(BASE_ORTOOLS_DLL_NAME).dll $(FSHARP_DEBUG) $(FS_SIGNING_FLAGS) ortools$Sfsharp$S$(FSHARP_ORTOOLS_DLL_NAME).fsx else $(warning Cannot find '$(FSHARP_COMPILER)' command which is needed for build. Please make sure it is installed and in system path.) endif