[libc-commits] [libc] 235e9cc - [libc][NFC][Obvious] Tidy up some CMake files.

[Siva Chandra Reddy via libc-commits]

Author: Siva Chandra Reddy
Date: 2020-06-09T15:54:07-07:00
New Revision: 235e9cc9243109079d68ca1e387069606b517d44

URL: https://github.com/llvm/llvm-project/commit/235e9cc9243109079d68ca1e387069606b517d44
DIFF: https://github.com/llvm/llvm-project/commit/235e9cc9243109079d68ca1e387069606b517d44.diff

LOG: [libc][NFC][Obvious] Tidy up some CMake files.

Conditionally adding subdirectories was missed in a few places previously.
This change adds the conditionals. A sub-directory was being added
needlessly in another place. That has been removed.

Added: 
    

Modified: 
    libc/config/linux/CMakeLists.txt
    libc/src/string/CMakeLists.txt
    libc/test/config/linux/CMakeLists.txt

Removed: 
    libc/config/linux/x86_64/CMakeLists.txt


################################################################################
diff  --git a/libc/config/linux/CMakeLists.txt b/libc/config/linux/CMakeLists.txt
index 6fdfb8cc555c..c8f496bf3f07 100644
--- a/libc/config/linux/CMakeLists.txt
+++ b/libc/config/linux/CMakeLists.txt
@@ -9,5 +9,3 @@ add_gen_header(
   DEPENDS
     libc.src.__support.common
 )
-
-add_subdirectory(x86_64)

diff  --git a/libc/config/linux/x86_64/CMakeLists.txt b/libc/config/linux/x86_64/CMakeLists.txt
deleted file mode 100644
index e69de29bb2d1..000000000000

diff  --git a/libc/src/string/CMakeLists.txt b/libc/src/string/CMakeLists.txt
index 634e5f900e94..114fce7d626d 100644
--- a/libc/src/string/CMakeLists.txt
+++ b/libc/src/string/CMakeLists.txt
@@ -132,4 +132,6 @@ add_bzero(bzero MARCH native)
 # Add all other relevant implementations for the native target.
 # ------------------------------------------------------------------------------
 
-include(${LIBC_STRING_TARGET_ARCH}/CMakeLists.txt)
+if(EXISTS ${LIBC_STRING_TARGET_ARCH})
+  include(${LIBC_STRING_TARGET_ARCH}/CMakeLists.txt)
+endif()

diff  --git a/libc/test/config/linux/CMakeLists.txt b/libc/test/config/linux/CMakeLists.txt
index 7dc887c8c2aa..caff2ef86e24 100644
--- a/libc/test/config/linux/CMakeLists.txt
+++ b/libc/test/config/linux/CMakeLists.txt
@@ -1,3 +1,5 @@
 add_libc_testsuite(libc_linux_tests)
 
-add_subdirectory(${LIBC_TARGET_MACHINE})
+if(EXISTS ${LIBC_TARGET_MACHINE})
+  add_subdirectory(${LIBC_TARGET_MACHINE})
+endif()