summaryrefslogtreecommitdiffstats
path: root/external/postgresql/ExternalProject_postgresql.mk
diff options
context:
space:
mode:
Diffstat (limited to 'external/postgresql/ExternalProject_postgresql.mk')
-rw-r--r--external/postgresql/ExternalProject_postgresql.mk8
1 files changed, 3 insertions, 5 deletions
diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk
index 37824f303306..1d0a13b6bb03 100644
--- a/external/postgresql/ExternalProject_postgresql.mk
+++ b/external/postgresql/ExternalProject_postgresql.mk
@@ -44,7 +44,7 @@ endif
ifeq ($(ENABLE_OPENSSL),TRUE)
ifeq ($(SYSTEM_OPENSSL),)
postgresql_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,openssl)/include
-postgresql_LDFLAGS += -L$(call gb_UnpackedTarball_get_dir,openssl)/ $(if $(filter $(OS),LINUX),-pthread)
+postgresql_LDFLAGS += -L$(call gb_UnpackedTarball_get_dir,openssl) $(if $(filter $(OS),LINUX),-pthread)
endif
endif
@@ -54,8 +54,6 @@ postgresql_LDFLAGS += \
-L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap_r/.libs \
-L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap/.libs \
-L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/liblber/.libs \
- $(if $(SYSTEM_NSS),,\
- -L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib) \
endif
@@ -69,14 +67,14 @@ $(call gb_ExternalProject_get_state_target,postgresql,build) :
--without-readline \
--without-zlib \
--with-ldap \
- $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+ $(gb_CONFIGURE_PLATFORMS) \
$(if $(ENABLE_OPENSSL),--with-openssl \
$(if $(WITH_GSSAPI),--with-gssapi)) \
$(if $(ENABLE_LDAP),,--with-ldap=no) \
CFLAGS="-fPIC" \
CPPFLAGS="$(postgresql_CPPFLAGS)" \
LDFLAGS="$(postgresql_LDFLAGS)" \
- $(if $(ENABLE_LDAP),EXTRA_LDAP_LIBS="-llber -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4") \
+ $(if $(ENABLE_LDAP),EXTRA_LDAP_LIBS="-llber") \
&& cd src/interfaces/libpq \
&& MAKEFLAGS= && $(MAKE) MAKELEVEL=0 all-static-lib)
$(call gb_Trace_EndRange,postgresql,EXTERNAL)