Skip to content

C
core
Kaydet (Commit) 42852bb7 authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Help openldap configure along when CC contains -fsanitize=address on Linux 

Change-Id: Ie1cebb9884d580d5e2bb0e885a22ee04b92aecb5
üst e71a61bc
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 1 deletion
external/openldap/ExternalProject_openldap.mk
Dosyayı görüntüle @ 42852bb7
......@@ -15,6 +15,17 @@ $(eval $(call gb_ExternalProject_register_targets,openldap,\
build \
))
openldap_LDFLAGS =
ifneq ($(SYSTEM_NSS),)
openldap_LDFLAGS += -L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib \
$(if $(filter AIX,$(OS)),-Wl$(COMMA)-brtl)
endif
# Help openldap's configure determine that it needs -lpthread even if libasan.so
# contains a pthread_create override:
ifneq ($(filter -fsanitize=address,$(CC)),)
openldap_LDFLAGS += -pthread
endif
$(call gb_ExternalProject_get_state_target,openldap,build) :
$(call gb_ExternalProject_run,build,\
./configure \
......@@ -34,8 +45,8 @@ $(call gb_ExternalProject_get_state_target,openldap,build) :
, \
CPPFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include" \
CFLAGS="-I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include" \
LDFLAGS="-L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib $(if $(filter AIX,$(OS)),-Wl$(COMMA)-brtl)" \
) \
$(if $(openldap_LDFLAGS),LDFLAGS="$(openldap_LDFLAGS)") \
&& MAKEFLAGS= && $(MAKE) \
)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment