Skip to content
This repository has been archived by the owner on Jan 3, 2023. It is now read-only.

Commit

Permalink
Only build FSharp PCL if reference assemblies found
Browse files Browse the repository at this point in the history
  • Loading branch information
rneatherway committed Feb 25, 2014
1 parent 0d2ee58 commit 9619958
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 1 deletion.
2 changes: 2 additions & 0 deletions config.make.in
Expand Up @@ -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/
Expand Down
10 changes: 9 additions & 1 deletion configure.ac
Expand Up @@ -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
Expand Down Expand Up @@ -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)

Expand Down
2 changes: 2 additions & 0 deletions src/fsharp/Makefile.in
Expand Up @@ -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
Expand Down

0 comments on commit 9619958

Please sign in to comment.