Skip to content

Commit

Permalink
[build] make all is default; Bump to LibZipSharp/1b217dab (#677)
Browse files Browse the repository at this point in the history
Commit 8ebb9cb inadvertently made `make prepare` the default target
when running on Linux, instead of `make all`, breaking semantics:

	$ make
	# pre-8ebb9cb2, invoked `make all` everywhere.
	# Invokes `make prepare` on Linux in 8ebb9cb, but
	# `make all` on macOS. Confusion!

Revert the default `make` target to `make all`.

Bump to LibZipSharp/master/1b217dab to increase reliability of
`libZipSharp.dll.config` creation on Linux if/when
`ldconfig -p | grep libzip` returns more than one shared library.
  • Loading branch information
Tim Wanders authored and jonpryor committed Jun 28, 2017
1 parent 3b74c26 commit 5432746
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ ifneq ($(MONO_OPTIONS),)
export MONO_OPTIONS
endif

ifeq ($(OS),Linux)
export LINUX_DISTRO := $(shell lsb_release -i -s || true)
export LINUX_DISTRO_RELEASE := $(shell lsb_release -r -s || true)
prepare:: linux-prepare
endif # $(OS)=Linux

include build-tools/scripts/msbuild.mk
all::
$(MSBUILD) $(MSBUILD_FLAGS) $(SOLUTION)

all-tests::
MSBUILD="$(MSBUILD)" tools/scripts/xabuild $(MSBUILD_FLAGS) Xamarin.Android-Tests.sln

ifeq ($(OS),Linux)
export LINUX_DISTRO := $(shell lsb_release -i -s || true)
export LINUX_DISTRO_RELEASE := $(shell lsb_release -r -s || true)
prepare:: linux-prepare
endif # $(OS)=Linux

prepare:: prepare-msbuild

Expand Down
2 changes: 1 addition & 1 deletion external/LibZipSharp

0 comments on commit 5432746

Please sign in to comment.