[kudu] branch master updated: Revert "[codegen] fix build on Ubuntu 22.04"

[la...@apache.org]

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

laiyingchun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kudu.git


The following commit(s) were added to refs/heads/master by this push:
     new bd9e920cc Revert "[codegen] fix build on Ubuntu 22.04"
bd9e920cc is described below

commit bd9e920cc9eba812e2299a97857229eb9f263c98
Author: Alexey Serbin <al...@apache.org>
AuthorDate: Wed Mar 15 18:06:18 2023 -0700

    Revert "[codegen] fix build on Ubuntu 22.04"
    
    This reverts commit 8ee73765fb78c246d3455029cdf02e15eac28926.
    
    Even if 8ee73765f fixes build on Ubuntu 22.04, it turns out that it
    breaks TSAN builds with earlier GCC versions.  Also, there are still
    some questions left on failed tests once Kudu builds at Ubuntu 22.04,
    so I'm suspecting wrong include files are actually picked up.
    
    Since I don't have time to troubleshoot this further right now, I'm
    reverting 8ee73765f to unblock other people who have multiple patches
    in progress since TSAN pre-commit builds are failing with 8ee73765f.
    
    Change-Id: Iee488e28ce70954223f7b657a035c3a859c83f49
    Reviewed-on: http://gerrit.cloudera.org:8080/19623
    Tested-by: Kudu Jenkins
    Reviewed-by: KeDeng <kd...@gmail.com>
    Reviewed-by: Yingchun Lai <la...@apache.org>
---
 src/kudu/codegen/CMakeLists.txt | 41 -----------------------------------------
 1 file changed, 41 deletions(-)

diff --git a/src/kudu/codegen/CMakeLists.txt b/src/kudu/codegen/CMakeLists.txt
index 28c96064f..eb32a41d5 100644
--- a/src/kudu/codegen/CMakeLists.txt
+++ b/src/kudu/codegen/CMakeLists.txt
@@ -106,47 +106,6 @@ if (APPLE)
       ${PREFIXED_IR_INCLUDES}
       -isysroot "${CMAKE_OSX_SYSROOT}")
   endif()
-else()
-    # Capture multi-line output of the preprocessor, joining stdout and stderr.
-    # The relevant part of the output looks like the following:
-    #
-    # #include "..." search starts here:
-    # #include <...> search starts here:
-    #  /usr/include/c++/11
-    #  /usr/include/x86_64-linux-gnu/c++/11
-    #  /usr/include/c++/11/backward
-    #  /usr/lib/gcc/x86_64-linux-gnu/11/include
-    #  /usr/local/include
-    #  /usr/include/x86_64-linux-gnu
-    #  /usr/include
-    # End of search list.
-    execute_process(
-      COMMAND ${CMAKE_CXX_COMPILER} -xc++ -E -Wp,-v /dev/null
-      ERROR_VARIABLE  CXX_CPP_DIRS_VAR
-      OUTPUT_VARIABLE CXX_CPP_DIRS_VAR
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-      RESULT_VARIABLE CXX_CPP_DIRS_EXIT_CODE)
-    if (NOT ${CXX_CPP_DIRS_CMD_EXIT_CODE} EQUAL 0)
-      message(FATAL_ERROR "failed to get preprocessor builtin directories")
-    endif()
-
-    # Use only the first two include paths: usually, that's enough.
-    # Using all the reported include paths might confuse codegen.
-    execute_process(
-      COMMAND echo ${CXX_CPP_DIRS_VAR}
-      COMMAND sed -n "s|^ ||p"
-      COMMAND head -2
-      COMMAND paste -s -d "\;"
-      RESULT_VARIABLE CXX_CPP_EXTRA_INCLUDE_DIRS_EXIT_CODE
-      OUTPUT_VARIABLE CXX_CPP_EXTRA_INCLUDE_DIRS
-      OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if (${CXX_CPP_EXTRA_INCLUDE_DIRS_EXIT_CODE} EQUAL 0)
-      foreach(dir ${CXX_CPP_EXTRA_INCLUDE_DIRS})
-        set(PREFIXED_IR_INCLUDES ${PREFIXED_IR_INCLUDES} -I${dir})
-      endforeach()
-    else()
-      message(FATAL_ERROR "failed to deduce path to libc++ headers")
-    endif()
 endif()
 
 # Get preprocessing definitions, which enable directives for glog and gtest.