[PATCH] D58427: Fix checking for rpc/xdr.h

[Enji Cooper via Phabricator via llvm-commits]

ngie updated this revision to Diff 196343.
ngie marked 7 inline comments as done.
ngie added a comment.

Remove all Linux and Solaris-specific changes, as they OSes don't seem to need rpc/types.h, unlike FreeBSD.


Repository:
  rG LLVM Github Monorepo

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D58427/new/

https://reviews.llvm.org/D58427

Files:
  compiler-rt/cmake/base-config-ix.cmake
  compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc


Index: compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
===================================================================
--- compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
@@ -114,6 +114,7 @@
 #include <netipx/ipx.h>
 #include <netrom/netrom.h>
 #if HAVE_RPC_XDR_H
+# include <rpc/types.h>
 # include <rpc/xdr.h>
 #endif
 #include <scsi/scsi.h>
Index: compiler-rt/cmake/base-config-ix.cmake
===================================================================
--- compiler-rt/cmake/base-config-ix.cmake
+++ compiler-rt/cmake/base-config-ix.cmake
@@ -4,12 +4,13 @@
 # runtime libraries.
 
 include(CheckIncludeFile)
+include(CheckIncludeFiles)
 include(CheckCXXSourceCompiles)
 
 check_include_file(unwind.h HAVE_UNWIND_H)
 
 # Used by sanitizer_common and tests.
-check_include_file(rpc/xdr.h HAVE_RPC_XDR_H)
+check_include_files("rpc/types.h;rpc/xdr.h" HAVE_RPC_XDR_H)
 if (NOT HAVE_RPC_XDR_H)
   set(HAVE_RPC_XDR_H 0)
 endif()


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D58427.196343.patch
Type: text/x-patch
Size: 1043 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190423/674697f1/attachment-0001.bin>