You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by we...@apache.org on 2019/04/18 05:57:44 UTC

[hadoop] branch branch-3.2 updated: YARN-9487. NodeManager native build shouldn't link against librt on macOS. Contributed by Siyao Meng.

This is an automated email from the ASF dual-hosted git repository.

weichiu pushed a commit to branch branch-3.2
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/branch-3.2 by this push:
     new 742a3ad  YARN-9487. NodeManager native build shouldn't link against librt on macOS. Contributed by Siyao Meng.
742a3ad is described below

commit 742a3ad24b0a09286e4272df4e2431cb30de5b7a
Author: Siyao Meng <sm...@cloudera.com>
AuthorDate: Wed Apr 17 22:56:23 2019 -0700

    YARN-9487. NodeManager native build shouldn't link against librt on macOS. Contributed by Siyao Meng.
    
    Signed-off-by: Wei-Chiu Chuang <we...@apache.org>
    (cherry picked from commit 6e4399ea61eb4301f4b6c59633d77c0a04efb12b)
---
 .../hadoop-yarn-server-nodemanager/src/CMakeLists.txt              | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/CMakeLists.txt b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/CMakeLists.txt
index 300bb65..af31bd3 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/CMakeLists.txt
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/CMakeLists.txt
@@ -188,5 +188,10 @@ add_executable(test-oom-listener
         main/native/oom-listener/impl/oom_listener.h
         main/native/oom-listener/test/oom_listener_test_main.cc
 )
-target_link_libraries(test-oom-listener gtest rt)
+if(CMAKE_SYSTEM_NAME MATCHES "Darwin")
+    # macOS doesn't have librt
+    target_link_libraries(test-oom-listener gtest)
+else()
+    target_link_libraries(test-oom-listener gtest rt)
+endif()
 output_directory(test-oom-listener test)


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org