Permalink
Browse files

Only build FSharp PCL if reference assemblies found

  • Loading branch information...
1 parent 0d2ee58 commit 9619958f7db602d4c56ef0e89bc9aea0936fe8db @rneatherway rneatherway committed Feb 24, 2014
Showing with 13 additions and 1 deletion.
  1. +2 −0 config.make.in
  2. +9 −1 configure.ac
  3. +2 −0 src/fsharp/Makefile.in
View
@@ -17,6 +17,8 @@ monogacdir21 := @abs_top_srcdir@/dependencies/mono/2.1
monogacdir35 := @MONOGACDIR35@
monogacdir40 := @MONOGACDIR40@
+pclenabled := @PCLENABLED@
+
gacdir := ${libdir}mono
tooldir := $(topdir)lib/bootstrap/4.0/
View
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ([2.61])
-AC_INIT([fsharp], [0.1], [avidigal@novell.com])
+AC_INIT([fsharp], [3.1], [https://github.com/fsharp/fsharp/issues])
# Checks for programs.
AC_PROG_MAKE_SET
@@ -66,6 +66,14 @@ if ! test -e $MONOGACDIR20/mscorlib.dll; then
AC_ERROR(Couldn't find the mono gac directory or mscorlib.dll in the usual places. Set --with-gacdir=<path>)
fi
+if test -e $MONOLIBDIR/mono/xbuild-frameworks/.NETPortable/v4.0/Profile/Profile47/mscorlib.dll; then
+ PCLENABLED=yes
+else
+ PCLENABLED=no
+fi
+AC_MSG_NOTICE(PCL Reference Assemblies found: $PCLENABLED)
+
+AC_SUBST(PCLENABLED)
AC_SUBST(MONOLIBDIR)
AC_SUBST(MONOGACDIR)
View
@@ -40,7 +40,9 @@ build clean install:
$(MAKE) -C FSharp.Core TargetFramework=net20 $@
$(MAKE) -C FSharp.Core TargetFramework=monodroid $@
$(MAKE) -C FSharp.Core TargetFramework=monotouch $@
+ifeq ("$(pclenabled)", "yes")
$(MAKE) -C FSharp.Core TargetFramework=portable-net45+sl5+win8 $@
+endif
# Add these to build portable FSharp.Core on Mac
# - Requires Mono 3.2.4 or greater

0 comments on commit 9619958

Please sign in to comment.