aboutsummaryrefslogtreecommitdiffstats
path: root/tools/edis
diff options
context:
space:
mode:
authorDouglas Gregor <dgregor@apple.com>2010-04-13 22:47:43 +0000
committerDouglas Gregor <dgregor@apple.com>2010-04-13 22:47:43 +0000
commit533ae9b71d88df8d1891c8c653eeb7912b25dbb0 (patch)
tree0b89e60f2551cb456e6fbc798eaa1b5635ccca91 /tools/edis
parent6327537a377d2b77748270258e99b257bf1723df (diff)
downloadexternal_llvm-533ae9b71d88df8d1891c8c653eeb7912b25dbb0.zip
external_llvm-533ae9b71d88df8d1891c8c653eeb7912b25dbb0.tar.gz
external_llvm-533ae9b71d88df8d1891c8c653eeb7912b25dbb0.tar.bz2
Unbreak CMake build by improving the EnhancedDisassembly makefile a
bit (we're not trying to build a shared library yet) and generating the X86GenEDInfo.inc and ARMGenEDInfo.inc files as necessary. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@101188 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/edis')
-rw-r--r--tools/edis/CMakeLists.txt18
1 files changed, 1 insertions, 17 deletions
diff --git a/tools/edis/CMakeLists.txt b/tools/edis/CMakeLists.txt
index 5f11ab4..f7a199d 100644
--- a/tools/edis/CMakeLists.txt
+++ b/tools/edis/CMakeLists.txt
@@ -1,4 +1,3 @@
-set(SHARED_LIBRARY TRUE)
set(LLVM_NO_RTTI 1)
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/EDInfo.inc
@@ -20,22 +19,7 @@ add_llvm_library(EnhancedDisassembly
${CMAKE_CURRENT_BINARY_DIR}/EDInfo.inc
)
-if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
- # FIXME: Deal with EDIS version?
- set_target_properties(EnhancedDisassembly
- PROPERTIES
- LINK_FLAGS "-avoid-version -Wl,-exported_symbols_list -Wl,${CMAKE_CURRENT_SOURCE_DIR}/EnhancedDisassembly.exports -Wl,-dead_strip -Wl"
- )
-endif()
-
-if(MSVC)
- # windows.h doesn't compile with /Za
- get_target_property(NON_ANSI_COMPILE_FLAGS CIndex COMPILE_FLAGS)
- string(REPLACE /Za "" NON_ANSI_COMPILE_FLAGS ${NON_ANSI_COMPILE_FLAGS})
- set_target_properties(EnhancedDisassembly PROPERTIES COMPILE_FLAGS ${NON_ANSI_COMPILE_FLAGS})
-endif(MSVC)
-
set_target_properties(EnhancedDisassembly
PROPERTIES
LINKER_LANGUAGE CXX)
- \ No newline at end of file
+