Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

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

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit10e57f8

Browse files
committed
targets.make: fix generation of Microsoft.FSharp.targets
This file was ending up installed as is, without the substitutionrequired to adjust some values such as {BuildSuffix}. As aconsequence, the file could not be used and xbuild would give anerror when trying to find the dll specified.The values to use forsubst.exe were taken from FSharpSource.targetsfile, which has a <Target> to call it, and was not being usedbecause xbuild is not (and cannot be, I suppose) used when compilingwith Mono due to bootstrapping issues.
1 parent4040af1 commit10e57f8

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

‎src/fsharp/targets.make‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
SOURCES :=$(patsubst$(srcdir)$(tmpdir)%,$(tmpdir)%,$(patsubst%,$(srcdir)%,$(sources)))
22

3+
# taken from FSharpSource.targets file:
4+
LKG_VERSION := 2.0.50726.900
5+
REPLACE_ARGS := {LkgVersion}$(LKG_VERSION) {BuildSuffix} "" {FSharpTargetsDir} unused
6+
37
.PHONY: install install-bin install-bin-2 install-bin-4 install-lib
48

59
all: do-4-0 do-2-0
@@ -48,7 +52,7 @@ do-2-0: $(objdir) $(objdir)$(TARGET_2_0) $(objdir)$(TARGET_4_0) $(objdir)$(TARGE
4852
then sn -R$(outdir)$(ASSEMBLY)$(srcdir)../../../mono.snk;\
4953
fi
5054
@iftest -e Microsoft.FSharp.targets;then\
51-
cpMicrosoft.FSharp.targets$(outdir);\
55+
mono subst.exe$(REPLACE_ARGS)Microsoft.FSharp.targets>$(outdir)Microsoft.FSharp.targets;\
5256
fi
5357

5458
do-4-0: DEFINES +=$(DEFINES_4_0)
@@ -72,7 +76,7 @@ do-4-0: $(objdir) $(objdir)$(TARGET_2_0) $(objdir)$(TARGET_4_0) $(objdir)$(TARGE
7276
then sn -R$(outdir)$(ASSEMBLY)$(srcdir)../../../mono.snk;\
7377
fi
7478
@iftest -e Microsoft.FSharp.targets;then\
75-
cpMicrosoft.FSharp.targets$(outdir);\
79+
mono subst.exe$(REPLACE_ARGS)Microsoft.FSharp.targets>$(outdir)Microsoft.FSharp.targets;\
7680
fi
7781

7882
install-lib-2: TARGET :=$(TARGET_2_0)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp