am 42ca21d4: am c27d4717: Merge "Fix libdl inclusion for default-ub."

* commit '42ca21d4960d605fa1a7202e9d91874f82857d5d': Fix libdl inclusion for default-ub.
2015-06-16 21:35:48 +00:00
parent ad48a4655a 42ca21d496
commit 652789bc3b
1 changed files with 2 additions and 1 deletions
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -52,12 +52,13 @@ endif

 ifneq ($(filter default-ub,$(my_sanitize)),)
  my_sanitize := $(CLANG_DEFAULT_UB_CHECKS)
-  my_ldlibs += -ldl

  ifdef LOCAL_IS_HOST_MODULE
    my_cflags += -fno-sanitize-recover=all
+    my_ldlibs += -ldl
  else
    my_cflags += -fsanitize-undefined-trap-on-error
+    my_shared_libraries += libdl
  endif
 endif