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

* commit 'c27d471742df9e69d4c0d932e8d7c11455bc3551': Fix libdl inclusion for default-ub.
2015-06-16 21:22:39 +00:00
parent d400f7740d c27d471742
commit 42ca21d496
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