Tuesday, January 30, 2018

[389-commits] [389-ds-base] 01/01: Ticket 49400 - Make CLANG configurable

This is an automated email from the git hooks/post-receive script.

mreynolds pushed a commit to branch master
in repository 389-ds-base.

commit 8743426c1410ef7535a57f67bf3d044c10eac29e
Author: Mark Reynolds <mreynolds@redhat.com>
Date: Tue Jan 30 11:38:35 2018 -0500

Ticket 49400 - Make CLANG configurable

Description: Make clang configurable and off by default

https://pagure.io/389-ds-base/issue/49400

Reviewed by: viktor(Thanks!)
---
Makefile.am | 11 ++++++++++-
configure.ac | 12 ++++++++++++
rpm.mk | 2 ++
rpm/389-ds-base.spec.in | 10 ++++++----
4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 34efb07..9fae072 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,6 +51,14 @@ else
PERL_ON = 0
endif

+if CLANG_ENABLE
+CLANG_ON = 1
+CLANG_LDFLAGS = -latomic
+else
+CLANG_ON = 0
+CLANG_LDFLAGS =
+endif
+
# We can't add the lfds includes all the time as they have a "bomb" in them that
# prevents compilation on unsupported hardware arches.
if ATOMIC_QUEUE_OPERATIONS
@@ -157,7 +165,7 @@ AM_LDFLAGS = -lpthread
else
#AM_LDFLAGS = -Wl,-z,defs
# Provide the tcmalloc links if needed
-AM_LDFLAGS = $(RUST_LDFLAGS) $(ASAN_DEFINES) $(PROFILING_LINKS) $(TCMALLOC_LINK) -latomic
+AM_LDFLAGS = $(RUST_LDFLAGS) $(ASAN_DEFINES) $(PROFILING_LINKS) $(TCMALLOC_LINK) $(CLANG_LDFLAGS)
endif

No comments:

Post a Comment