diff options
| author | Siva Chandra Reddy <sivachandra@google.com> | 2020-04-21 10:09:25 -0700 |
|---|---|---|
| committer | Siva Chandra Reddy <sivachandra@google.com> | 2020-04-21 10:10:18 -0700 |
| commit | a8086ba4ac85152d8407630e56e9ee5c8b46a214 (patch) | |
| tree | 07c31ca6278a7e7d90c73e26498f6d0ee7bdb1df /libc/loader | |
| parent | 66590e1e9ebb8c73fdc0e5171505a29bc062ff20 (diff) | |
| download | llvm-a8086ba4ac85152d8407630e56e9ee5c8b46a214.zip llvm-a8086ba4ac85152d8407630e56e9ee5c8b46a214.tar.gz llvm-a8086ba4ac85152d8407630e56e9ee5c8b46a214.tar.bz2 | |
[libc] Revert "Propagate entrypoint deps to downstream targets."
This reverts commit 20cb440ea210597bf223505604bb5f2220a067c6 as the
target llvmlibc seems to be failing on the bots.
Diffstat (limited to 'libc/loader')
| -rw-r--r-- | libc/loader/linux/CMakeLists.txt | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/libc/loader/linux/CMakeLists.txt b/libc/loader/linux/CMakeLists.txt index b972f72..f58603f 100644 --- a/libc/loader/linux/CMakeLists.txt +++ b/libc/loader/linux/CMakeLists.txt @@ -8,7 +8,7 @@ function(add_loader_object name) ) get_fq_target_name(${name} fq_target_name) - get_fq_deps_list(fq_deps_list ${ADD_LOADER_OBJECT_DEPENDS}) + if(ADD_LOADER_OBJECT_ALIAS) list(LENGTH ADD_LOADER_OBJECT_DEPENDS deps_size) if(NOT (${deps_size} EQUAL "1")) @@ -23,15 +23,14 @@ function(add_loader_object name) set_target_properties( ${fq_target_name} PROPERTIES - "TARGET_TYPE" "${OBJECT_LIBRARY_TARGET_TYPE}" - "OBJECT_FILES" "" - "DEPS" "${fq_dep_name}" + "TARGET_TYPE" "LOADER_OBJECT" + "OBJECT_FILES" ${dep_objfile} ) return() endif() add_object_library( - ${name}.__objects__ + ${name}_objects SRCS ${ADD_LOADER_OBJECT_SRC} DEPENDS ${ADD_LOADER_OBJECT_DEPENDS} COMPILE_OPTIONS ${ADD_LOADER_OBJECT_COMPILE_OPTIONS} @@ -40,8 +39,8 @@ function(add_loader_object name) set(objfile ${LIBC_BUILD_DIR}/lib/${name}.o) add_custom_command( OUTPUT ${objfile} - COMMAND cp $<TARGET_OBJECTS:${fq_target_name}.__objects__> ${objfile} - DEPENDS $<TARGET_OBJECTS:${fq_target_name}.__objects__> + COMMAND cp $<TARGET_OBJECTS:${fq_target_name}_objects> ${objfile} + DEPENDS $<TARGET_OBJECTS:${fq_target_name}_objects> ) add_custom_target( ${fq_target_name} @@ -50,9 +49,8 @@ function(add_loader_object name) set_target_properties( ${fq_target_name} PROPERTIES - "TARGET_TYPE" "${OBJECT_LIBRARY_TARGET_TYPE}" - "OBJECT_FILES" "" - "DEPS" "${fq_target_name}.__objects__" + "TARGET_TYPE" "LOADER_OBJECT" + "OBJECT_FILES" ${objfile} ) endfunction() |