[lld] r224364 - Merging r220117:

[Hans Wennborg]

Author: hans
Date: Tue Dec 16 14:39:02 2014
New Revision: 224364

URL: http://llvm.org/viewvc/llvm-project?rev=224364&view=rev
Log:
Merging r220117:
------------------------------------------------------------------------
r220117 | rsmith | 2014-10-17 17:56:31 -0700 (Fri, 17 Oct 2014) | 6 lines

Hardcode the list of ELF targets here rather than using a glob.

The code was making non-portable assumptions about the exact string returned by
the glob (possibly by the shell?); this is more robust and matches what is done
everywhere else.

------------------------------------------------------------------------

Modified:
    lld/branches/release_35/   (props changed)
    lld/branches/release_35/lib/ReaderWriter/ELF/CMakeLists.txt

Propchange: lld/branches/release_35/
------------------------------------------------------------------------------
    svn:mergeinfo = /lld/trunk:220117

Modified: lld/branches/release_35/lib/ReaderWriter/ELF/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lld/branches/release_35/lib/ReaderWriter/ELF/CMakeLists.txt?rev=224364&r1=224363&r2=224364&view=diff
==============================================================================
--- lld/branches/release_35/lib/ReaderWriter/ELF/CMakeLists.txt (original)
+++ lld/branches/release_35/lib/ReaderWriter/ELF/CMakeLists.txt Tue Dec 16 14:39:02 2014
@@ -17,11 +17,8 @@ target_link_libraries(lldELF
 
 include_directories(.)
 
-file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt")
-
-foreach(dir ${all_valid_subdirs})
-    if(${dir} MATCHES "^([^/]*)//CMakeLists.txt")
-        string(REGEX REPLACE "^([^/]*)//CMakeLists.txt" "\\1" dir_trimmed ${dir})
-        add_subdirectory(${dir_trimmed})
-    endif()
-endforeach(dir)
+add_subdirectory(Hexagon)
+add_subdirectory(Mips)
+add_subdirectory(PPC)
+add_subdirectory(X86)
+add_subdirectory(X86_64)