From eb8e099f09f4901d3651dcb80c17256aaad6c8d7 Mon Sep 17 00:00:00 2001 From: Jelte Fennema Date: Wed, 26 Feb 2020 17:41:14 +0100 Subject: [PATCH] Fix Makefile so that it builds safestringlib correctly on OSX --- src/backend/distributed/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/backend/distributed/Makefile b/src/backend/distributed/Makefile index d8c8bd9e5..1a860796f 100644 --- a/src/backend/distributed/Makefile +++ b/src/backend/distributed/Makefile @@ -52,7 +52,11 @@ SQL_BUILDDIR=build/sql $(safestringlib_a): $(safestringlib_sources) rm -rf $(safestringlib_builddir) mkdir -p $(safestringlib_builddir) - cd $(safestringlib_builddir) && cmake $(safestringlib_srcdir) && make -j5 + @# exports of LDFLAGS and CPPFLAGS are to make sure the ones from this + @# Makefile are not used + +cd $(safestringlib_builddir) && \ + export LDFLAGS='' && export CPPFLAGS='' && \ + cmake $(safestringlib_srcdir) && make citus.so: $(safestringlib_a)