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

Commit

Permalink
Fix brew build: remove redundant explicit copy (#724)
Browse files Browse the repository at this point in the history
* remove redundant explicit copy

* fix build
  • Loading branch information
dsyme committed Apr 19, 2017
1 parent 43c65ad commit e8ff6c9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 9 deletions.
7 changes: 1 addition & 6 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@ include $(topsrcdir)config.make
restore:
MONO_ENV_OPTIONS=$(monoopts) mono .nuget/NuGet.exe restore packages.config -PackagesDirectory packages -ConfigFile .nuget/NuGet.Config

# We need the bootstrap's FSharp.Core to run the proto
build-proto: restore $(bootstrap)/FSharp.Core.dll $(bootstrap)/FSharp.Core.sigdata $(bootstrap)/FSharp.Core.optdata
@-mkdir -p $(protodir)
cp -p $(bootstrap)/FSharp.Core.dll $(protodir)FSharp.Core.dll
cp -p $(bootstrap)/FSharp.Core.sigdata $(protodir)FSharp.Core.sigdata
cp -p $(bootstrap)/FSharp.Core.optdata $(protodir)FSharp.Core.optdata
build-proto: restore
$(MAKE) -C src/fsharp/FSharp.Build-proto Configuration=Proto $@
$(MAKE) -C src/fsharp/FSharp.Compiler-proto Configuration=Proto $@
$(MAKE) -C src/fsharp/Fsc-proto Configuration=Proto $@
Expand Down
4 changes: 1 addition & 3 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,10 @@ if ! test "x$with_gacdir" = "xno"; then
MONOGACDIR=$(cd "$with_gacdir/.." && pwd)
fi

MONOGACDIR20="$MONOGACDIR"/2.0
MONOGACDIR35="$MONOGACDIR"/3.5
MONOGACDIR40="$MONOGACDIR"/4.0
MONOGACDIR45="$MONOGACDIR"/4.5

if ! test -e $MONOGACDIR20/mscorlib.dll -o -e $MONOGACDIR45/mscorlib.dll; then
if ! test -e $MONOGACDIR45/mscorlib.dll; then
AC_ERROR(Couldn't find the mono gac directory or mscorlib.dll in the usual places. Set --with-gacdir=<path>)
fi

Expand Down

0 comments on commit e8ff6c9

Please sign in to comment.