Skip to content
This repository was archived by the owner on Nov 16, 2020. It is now read-only.

Commit b39560c

Browse files
committed
linux branch: add libiberty dependency to xenia-cpu
From PR xenia-project/xenia#1405
1 parent 3c586eb commit b39560c

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ matrix:
1212
- libgtk-3-dev
1313
- libvulkan-dev
1414
- llvm-7-dev
15+
- libiberty-dev
16+
- libunwind-dev
1517
compiler: clang
1618
env:
1719
- CMAKE_FLAGS="-DXENIA_LINK_SHARED=OFF -DPython3_EXECUTABLE=/usr/bin/python3"
@@ -25,6 +27,8 @@ matrix:
2527
- libgtk-3-dev
2628
- libvulkan-dev
2729
- llvm-7-dev
30+
- libiberty-dev
31+
- libunwind-dev
2832
compiler: clang
2933
env:
3034
- CMAKE_FLAGS="-DXENIA_LINK_SHARED=ON -DPython3_EXECUTABLE=/usr/bin/python3"

cmake/xenia-cpu.cmake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ add_library(${NAME} ${LIBRARY_TYPE}
2424
${${NAME}_COMPILER_PASSES_SOURCES}
2525
${${NAME}_HIR_SOURCES}
2626
${${NAME}_PPC_SOURCES})
27+
if (UNIX)
28+
find_library(IBERTY_LIBRARY iberty REQUIRED)
29+
find_library(UNWIND_LIBRARY unwind REQUIRED)
30+
endif()
2731
target_include_directories(${NAME}
2832
PRIVATE
2933
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/xenia/src>
@@ -34,5 +38,5 @@ target_include_directories(${NAME}
3438
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/xenia/third_party>)
3539
find_package(LLVM REQUIRED CONFIG)
3640
llvm_map_components_to_libnames(llvm_libs support)
37-
target_link_libraries(${NAME} PRIVATE mspack ${llvm_libs})
41+
target_link_libraries(${NAME} PRIVATE mspack ${llvm_libs} ${IBERTY_LIBRARY} ${UNWIND_LIBRARY})
3842
set_target_properties(${NAME} PROPERTIES FOLDER "xenia")

0 commit comments

Comments
 (0)