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

Commit602770a

Browse files
author
Andreia Gaita
committed
Bump the mono requiremente on the README - needs mono a57254256 or later
Fix mono paths detection.Fix clean and partial makes
1 parent792f8ea commit602770a

File tree

4 files changed

+11
-10
lines changed

4 files changed

+11
-10
lines changed

‎Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include$(topsrcdir)config.make
22

3-
allcleaninstalldo-2-0do-4-0:
3+
allcleaninstalldo-2-0do-4-0clean-2-0clean-4-0:
44
$(MAKE) -C src/fsharp$@
55

66
dist:

‎README‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ This build is based on F# Powerpack r54075
1111

1212
======= REQUIREMENTS =======
1313

14-
Requires mono 2.8.
14+
Requires mono trunk, after September 23 - this is due to missing IStructuralComparable.CompareTo
15+
implementations, which F# requires and which were commited on 2010-09-23 on commit a57254256
16+
1517
Requires bootstrapping libraries, tools and f# compiler. The lib/bootstrap/X.0 directories contain
1618
mono-built libraries, compiler and tools that can be used to bootstrap a build. You can also supply
1719
your own via the --with-bootstrap option.

‎config.make.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ topdir := @abs_top_srcdir@/
44
builddir := @abs_top_builddir@/
55
libdir := ${prefix}/lib/
66
installdir := ${prefix}/bin/
7-
monodir :=$(libdir)mono/
7+
monodir :=`pkg-config --variable=libdir mono`/mono/
88
libdir2 := $(monodir)2.0/
99
libdir35 := $(monodir)3.5/
1010
libdir4 := $(monodir)4.0/

‎src/fsharp/targets.make‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ SOURCES := $(patsubst $(srcdir)$(tmpdir)%,$(tmpdir)%,$(patsubst %,$(srcdir)%,$(s
22

33
.PHONY: install install-bin install-bin-2 install-bin-4 install-lib
44

5-
all:$(objdir)$(objdir)$(TARGET_2_0)$(objdir)$(TARGET_4_0)do-4-0 do-2-0
5+
all: do-4-0 do-2-0
66

77
install:
88

99
clean: clean-4-0 clean-2-0
10+
@-rm -f$(tmpdir)*
1011

1112
clean-2-0: TARGET :=$(TARGET_2_0)
1213
clean-2-0:
13-
@-rm -f$(tmpdir)*/*
14-
@-rm -f$(objdir)*/*
14+
@-rm -rf$(objdir)
1515
@-rm -f$(outdir)$(ASSEMBLY)
1616
@-rm -f$(outdir)$(ASSEMBLY).mdb
1717
@-rm -f$(outdir)$(NAME).xml
@@ -20,8 +20,7 @@ clean-2-0:
2020

2121
clean-4-0: TARGET :=$(TARGET_4_0)
2222
clean-4-0:
23-
@-rm -f$(tmpdir)*/*
24-
@-rm -f$(objdir)*/*
23+
@-rm -rf$(objdir)
2524
@-rm -f$(outdir)$(ASSEMBLY)
2625
@-rm -f$(outdir)$(ASSEMBLY).mdb
2726
@-rm -f$(outdir)$(NAME).xml
@@ -34,7 +33,7 @@ do-2-0: FLAGS += $(FLAGS_2_0)
3433
do-2-0: TARGET :=$(TARGET_2_0)
3534
do-2-0: VERSION :=$(VERSION_2_0)
3635
do-2-0: libdir =$(libdir2)
37-
do-2-0:$(objdir)$(TARGET_2_0)/$(ASSEMBLY)
36+
do-2-0:$(objdir)$(objdir)$(TARGET_2_0)$(objdir)$(TARGET_4_0)$(objdir)$(TARGET_2_0)/$(ASSEMBLY)
3837
@mkdir -p$(outdir)
3938
@cp$(objdir)$(ASSEMBLY)$(outdir)
4039
@-cp$(objdir)$(NAME).xml$(outdir)
@@ -55,7 +54,7 @@ do-4-0: FLAGS += $(FLAGS_4_0)
5554
do-4-0: TARGET :=$(TARGET_4_0)
5655
do-4-0: VERSION :=$(VERSION_4_0)
5756
do-4-0: libdir =$(libdir4)
58-
do-4-0:$(objdir)$(TARGET_4_0)/$(ASSEMBLY)
57+
do-4-0:$(objdir)$(objdir)$(TARGET_2_0)$(objdir)$(TARGET_4_0)$(objdir)$(TARGET_4_0)/$(ASSEMBLY)
5958
@mkdir -p$(outdir)
6059
@cp$(objdir)$(ASSEMBLY)$(outdir)
6160
@-cp$(objdir)$(NAME).xml$(outdir)

0 commit comments

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