Skip to content

Commit 6ff12b6

Browse files
committed
update tools
1 parent e9d7cb9 commit 6ff12b6

33 files changed

+21
-457
lines changed

config.make.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ xamarinmacenabled := @XAMARINMACENABLED@
2828

2929
gacdir := ${libdir}mono
3030

31-
tooldir := $(topdir)lib/bootstrap/4.0/
32-
3331
TargetFramework = net40
3432
CONFIG = release
3533
Configuration = Release
@@ -220,7 +218,6 @@ endif
220218
FSCORE_DELAY_SIGN_TOKEN = b03f5f7f11d50a3a
221219
SIGN_TOKEN = f536804aa0eb945b
222220

223-
bootstrapdir = $(bootstrap)/4.0/
224221
tmpdir = .libs/$(CONFIG)/
225222
objdir = $(tmpdir)$(TARGET)/
226223
protodir = $(builddir)/lib/proto/

configure.ac

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,9 @@ fi
4646

4747
AC_ARG_WITH([bootstrap],
4848
[ --with-bootstrap=<path>],
49-
[], [with_bootstrap=lib/bootstrap])
50-
with_bootstrap=$(cd "$with_bootstrap" && pwd)
49+
[], [with_bootstrap=packages/FSharp.Compiler.Tools.4.0.0.1/tools])
50+
with_bootstrap=$(mkdir -p "$with_bootstrap" && cd "$with_bootstrap" && pwd)
51+
AC_MSG_NOTICE(Using bootstrap : $with_bootstrap)
5152
AC_SUBST(with_bootstrap)
5253

5354
AC_ARG_WITH([gacdir],

lib/bootstrap/4.0/FSharp.Build.dll

-49 KB
Binary file not shown.
-21.5 KB
Binary file not shown.
-7.5 KB
Binary file not shown.
-11.1 MB
Binary file not shown.

lib/bootstrap/4.0/FSharp.Core.dll

100755100644
-375 KB
Binary file not shown.
-418 KB
Binary file not shown.

lib/bootstrap/4.0/FSharp.Core.pdb

-2.52 MB
Binary file not shown.
-536 KB
Binary file not shown.

0 commit comments

Comments
 (0)