Skip to content

Commit bb60ec7

Browse files
authored
Merge pull request #5997 from Snehil-Shah/fix-darwin-build
build: fix build_deps_debug on Darwin
2 parents db0a211 + 1fb7f38 commit bb60ec7

3 files changed

Lines changed: 6 additions & 2 deletions

File tree

deps/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,10 +261,12 @@ ifeq ($(UNAME_S),Darwin)
261261
else
262262
cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(SSL_IDIR) -DOPENSSL_LIBRARIES=$(SSL_LDIR) -DCMAKE_POLICY_VERSION_MINIMUM=3.5 .
263263
endif
264+
ifneq ($(UNAME_S),Darwin)
264265
ifeq ($(PROXYDEBUG),1)
265266
cd mariadb-client-library/mariadb_client && patch -p0 < ../ma_context.h.patch
266267
else ifeq ($(USEVALGRIND),1)
267268
cd mariadb-client-library/mariadb_client && patch -p0 < ../ma_context.h.patch
269+
endif
268270
endif
269271
cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_stmt.c.patch
270272
cd mariadb-client-library/mariadb_client && patch -p0 < ../mariadb_lib.c.patch
@@ -420,7 +422,7 @@ endif
420422
libusual: libusual/libusual/.libs/libusual.a
421423

422424

423-
libscram/lib/libscram.a:postgresql/postgresql/src/interfaces/libpq/libpq.a
425+
libscram/lib/libscram.a:postgresql/postgresql/src/interfaces/libpq/libpq.a
424426
cd libscram && rm -rf lib/* || true
425427
cd libscram && CC=${CC} CXX=${CXX} ${MAKE} LIBOPENSSL_DIR="$(SSL_IDIR)" POSTGRESQL_DIR="$(shell pwd)/postgresql/postgresql/"
426428

doc/BUILD-MACOS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Ensure you have [Homebrew](https://brew.sh/) installed.
1111
Run the following command to install the required build tools and libraries:
1212

1313
```bash
14-
brew install automake bzip2 cmake make git gpatch gnutls openssl@3 icu4c pkg-config libiconv zlib
14+
brew install automake bzip2 cmake make git gpatch gnutls openssl@3 icu4c pkg-config libiconv libtool zlib
1515
```
1616

1717
## Compilation Steps

src/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,10 @@ endif
9797

9898
MYCXXFLAGS := $(STDCPP)
9999
ifeq ($(CXX),clang++)
100+
ifneq ($(UNAME_S),Darwin)
100101
MYCXXFLAGS += -fuse-ld=lld
101102
endif
103+
endif
102104
MYCXXFLAGS += $(IDIRS) $(OPTZ) $(DEBUG) $(PSQLCH) $(PSQL40) $(PSQL31) $(PSQLFFTO) $(PSQLTSDB) -DGITVERSION=\"$(GIT_VERSION)\" $(NOJEM) $(WGCOV) $(WASAN)
103105

104106

0 commit comments

Comments
 (0)