Skip to content

Commit 6c3cebd

Browse files
committed
MAPREDUCE-6078. native-task: fix gtest build on macosx (Binglin Chang)
1 parent dff95f7 commit 6c3cebd

File tree

5 files changed

+2834
-1884
lines changed

5 files changed

+2834
-1884
lines changed

hadoop-mapreduce-project/CHANGES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,8 @@ Trunk (Unreleased)
222222

223223
MAPREDUCE-6077. native-task: Remove CustomModule examples in nativetask (seanzhong)
224224

225+
MAPREDUCE-6078. native-task: fix gtest build on macosx (Binglin Chang)
226+
225227
Release 2.6.0 - UNRELEASED
226228

227229
INCOMPATIBLE CHANGES

hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,6 @@ add_executable(nttest
249249
${D}/test/test_commons.cc)
250250

251251

252-
IF (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
253-
# macos clang with libc++ does not have tr1/tuple, just tuple
254-
SET_TARGET_PROPERTIES(nttest PROPERTIES COMPILE_FLAGS "-DGTEST_USE_OWN_TR1_TUPLE=1")
255-
ENDIF()
256-
257252
target_link_libraries(nttest
258253
nativetask_static
259254
gtest

0 commit comments

Comments
 (0)