blob: d73f402a30055530680689345d61ede10400b3df (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
|
diff -Naur emilpro-3-orig/CMakeLists.txt emilpro-3/CMakeLists.txt
--- emilpro-3-orig/CMakeLists.txt 2016-03-29 13:19:47.035441401 -0400
+++ emilpro-3/CMakeLists.txt 2016-03-29 13:18:36.650443067 -0400
@@ -11,7 +11,6 @@
set (BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
# Dependencies
-include (${CMAKE_CURRENT_SOURCE_DIR}/cmake/BuildBinutils.cmake)
find_package (LibElf REQUIRED)
find_package (PkgConfig REQUIRED)
@@ -30,7 +29,6 @@
pkg_check_modules(LIBCURL libcurl)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -D_GLIBCXX_USE_NANOSLEEP -DPACKAGE=emilpro -DPACKAGE_VERSION=1")
-LINK_DIRECTORIES(${CMAKE_BINARY_DIR}/install-binutils/lib ${CMAKE_BINARY_DIR}/install-binutils/lib64)
if (HAVE_BFD_MULTIARCH)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DHAVE_BFD_MULTIARCH")
@@ -110,7 +108,6 @@
src/include/
${CMAKE_BINARY_DIR}
${LIBELF_INCLUDE_DIRS}
- ${CMAKE_BINARY_DIR}/install-binutils/include/
${GTKMM_INCLUDE_DIRS}
${GTKSOURCEVIEWMM_INCLUDE_DIRS}
${LIBXMLPP_INCLUDE_DIRS}
@@ -128,8 +125,6 @@
tools/squash-instruction-models.cc
)
-set_property(TARGET emilpro APPEND PROPERTY OBJECT_DEPENDS binutils)
-set_property(TARGET tools/squash-instruction-models APPEND PROPERTY OBJECT_DEPENDS binutils)
set (BASE_LIBS
${LIBELF_LIBRARIES}
diff -Naur emilpro-3-orig/src/namemangler.cc emilpro-3/src/namemangler.cc
--- emilpro-3-orig/src/namemangler.cc 2016-03-29 13:17:23.957444786 -0400
+++ emilpro-3/src/namemangler.cc 2016-03-29 13:18:57.306442578 -0400
@@ -1,7 +1,7 @@
#include <namemangler.hh>
#include <bfd.h>
-#include <demangle.h>
+#include <libiberty/demangle.h>
using namespace emilpro;
|
GitWeb
