Skip to content

Commit

Permalink
Merge #46771
Browse files Browse the repository at this point in the history
46771: c-deps/geos: do not compile if using Windows r=petermattis a=otan

Not sure what's causing the errors (guess I'd need to set a Windows
machine up to find out), but since we're not able planning to support
Windows (we don't have the right extensions set up anyway!) I'd move to
just not compile c-deps/geos on it.

Release note: None

Co-authored-by: Oliver Tan <[email protected]>
  • Loading branch information
craig[bot] and otan committed Mar 31, 2020
2 parents 8a50e9f + be67293 commit 7ae1efe
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -493,8 +493,8 @@ LIBGEOS := $(DYN_LIB_DIR)/libgeos.$(DYN_EXT)

C_LIBS_COMMON = \
$(if $(use-stdmalloc),,$(LIBJEMALLOC)) \
$(if $(target-is-windows),,$(LIBEDIT)) \
$(LIBPROTOBUF) $(LIBSNAPPY) $(LIBGEOS) $(LIBROCKSDB)
$(if $(target-is-windows),,$(LIBEDIT) $(LIBGEOS)) \
$(LIBPROTOBUF) $(LIBSNAPPY) $(LIBROCKSDB)
C_LIBS_OSS = $(C_LIBS_COMMON) $(LIBROACH)
C_LIBS_CCL = $(C_LIBS_COMMON) $(LIBCRYPTOPP) $(LIBROACHCCL)

Expand Down

0 comments on commit 7ae1efe

Please sign in to comment.