mirror of
https://github.com/RPCSX/llvm.git
synced 2025-01-23 12:45:47 +00:00
CMake: Re-enabled build of llvm-config. Removed recursive invocation
of cmake. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@78768 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
26255adcaa
commit
2803365c4e
@ -153,10 +153,6 @@ else(WIN32)
|
|||||||
endif(UNIX)
|
endif(UNIX)
|
||||||
endif(WIN32)
|
endif(WIN32)
|
||||||
|
|
||||||
if( EXISTS ${LLVM_TOOLS_BINARY_DIR}/llvm-config )
|
|
||||||
set(HAVE_LLVM_CONFIG 1)
|
|
||||||
endif( EXISTS ${LLVM_TOOLS_BINARY_DIR}/llvm-config )
|
|
||||||
|
|
||||||
include(config-ix)
|
include(config-ix)
|
||||||
|
|
||||||
option(LLVM_ENABLE_PIC "Build Position-Independent Code" OFF)
|
option(LLVM_ENABLE_PIC "Build Position-Independent Code" OFF)
|
||||||
|
@ -2,9 +2,7 @@
|
|||||||
# large and three small executables. This is done to minimize memory load
|
# large and three small executables. This is done to minimize memory load
|
||||||
# in parallel builds. Please retain this ordering.
|
# in parallel builds. Please retain this ordering.
|
||||||
|
|
||||||
# FIXME: We don't yet have the ability to build llvm-config with CMake
|
if( NOT MSVC )
|
||||||
# based on explicit dependencies.
|
|
||||||
if (FALSE)
|
|
||||||
add_subdirectory(llvm-config)
|
add_subdirectory(llvm-config)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
@ -103,7 +103,6 @@ add_custom_command(OUTPUT ${LLVM_CONFIG}
|
|||||||
COMMAND ${CMAKE_COMMAND} -E remove -f temp.sed
|
COMMAND ${CMAKE_COMMAND} -E remove -f temp.sed
|
||||||
COMMAND cat ${FINAL_LIBDEPS} >> ${LLVM_CONFIG}
|
COMMAND cat ${FINAL_LIBDEPS} >> ${LLVM_CONFIG}
|
||||||
COMMAND chmod +x ${LLVM_CONFIG}
|
COMMAND chmod +x ${LLVM_CONFIG}
|
||||||
COMMAND cd ${CMAKE_BINARY_DIR} && ${CMAKE_COMMAND} -U HAVE_LLVM_CONFIG -D LLVM_BINARY_DIR="${LLVM_BINARY_DIR}" ${CMAKE_SOURCE_DIR}
|
|
||||||
DEPENDS ${FINAL_LIBDEPS} ${LLVM_CONFIG_IN}
|
DEPENDS ${FINAL_LIBDEPS} ${LLVM_CONFIG_IN}
|
||||||
COMMENT "Building llvm-config script."
|
COMMENT "Building llvm-config script."
|
||||||
)
|
)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user