Skip to content

Commit 4f982cf

Browse files
fuzyllfuzyll
committed
Don't try to fix rpaths in static archives.
1 parent aab52e4 commit 4f982cf

7 files changed

Lines changed: 42 additions & 7 deletions

File tree

‎plugins/bntl_utils/CMakeLists.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,12 +157,17 @@ elseif(WIN32)
157157
)
158158
endif()
159159
else()
160+
if(DEMO)
161+
set(BN_FIX_RPATH_COMMAND ${CMAKE_COMMAND} -E true)
162+
else()
163+
set(BN_FIX_RPATH_COMMAND ${CMAKE_COMMAND} -DRPATH_KIND=plugin -DBINARY_PATH=${OUTPUT_FILE_PATH} -P "${BN_API_SOURCE_DIR}/cmake/SetElfRpath.cmake")
164+
endif()
160165
add_custom_command(
161166
OUTPUT ${OUTPUT_FILE_PATH}
162167
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS} --package binaryninjacore-sys
163168
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} build ${CARGO_OPTS} ${CARGO_FEATURES}
164169
COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_FILE_NAME} ${OUTPUT_FILE_PATH}
165-
COMMAND ${CMAKE_COMMAND} -DRPATH_KIND=plugin -DBINARY_PATH=${OUTPUT_FILE_PATH} -P "${BN_API_SOURCE_DIR}/cmake/SetElfRpath.cmake"
170+
COMMAND ${BN_FIX_RPATH_COMMAND}
166171
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
167172
DEPENDS ${PLUGIN_SOURCES} ${API_SOURCES}
168173
)

‎plugins/idb_import/CMakeLists.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,16 @@ elseif(WIN32)
125125
DEPENDS ${PLUGIN_SOURCES} ${API_SOURCES})
126126
endif()
127127
else()
128+
if(DEMO)
129+
set(BN_FIX_RPATH_COMMAND ${CMAKE_COMMAND} -E true)
130+
else()
131+
set(BN_FIX_RPATH_COMMAND ${CMAKE_COMMAND} -DRPATH_KIND=plugin -DBINARY_PATH=${OUTPUT_FILE_PATH} -P "${BN_API_SOURCE_DIR}/cmake/SetElfRpath.cmake")
132+
endif()
128133
add_custom_command(
129134
OUTPUT ${OUTPUT_FILE_PATH}
130135
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} build ${CARGO_OPTS} ${CARGO_FEATURES}
131136
COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_FILE_NAME} ${OUTPUT_FILE_PATH}
132-
COMMAND ${CMAKE_COMMAND} -DRPATH_KIND=plugin -DBINARY_PATH=${OUTPUT_FILE_PATH} -P "${BN_API_SOURCE_DIR}/cmake/SetElfRpath.cmake"
137+
COMMAND ${BN_FIX_RPATH_COMMAND}
133138
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
134139
DEPENDS ${PLUGIN_SOURCES} ${API_SOURCES})
135140
endif()

‎plugins/pdb-ng/CMakeLists.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,17 @@ elseif(WIN32)
141141
)
142142
endif()
143143
else()
144+
if(DEMO)
145+
set(BN_FIX_RPATH_COMMAND ${CMAKE_COMMAND} -E true)
146+
else()
147+
set(BN_FIX_RPATH_COMMAND ${CMAKE_COMMAND} -DRPATH_KIND=plugin -DBINARY_PATH=${OUTPUT_FILE_PATH} -P "${BN_API_SOURCE_DIR}/cmake/SetElfRpath.cmake")
148+
endif()
144149
add_custom_command(
145150
OUTPUT ${OUTPUT_FILE_PATH}
146151
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS} --package binaryninjacore-sys
147152
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} build ${CARGO_OPTS} ${CARGO_FEATURES}
148153
COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_FILE_NAME} ${OUTPUT_FILE_PATH}
149-
COMMAND ${CMAKE_COMMAND} -DRPATH_KIND=plugin -DBINARY_PATH=${OUTPUT_FILE_PATH} -P "${BN_API_SOURCE_DIR}/cmake/SetElfRpath.cmake"
154+
COMMAND ${BN_FIX_RPATH_COMMAND}
150155
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
151156
DEPENDS ${PLUGIN_SOURCES} ${API_SOURCES}
152157
)

‎plugins/svd/CMakeLists.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,12 +157,17 @@ elseif(WIN32)
157157
)
158158
endif()
159159
else()
160+
if(DEMO)
161+
set(BN_FIX_RPATH_COMMAND ${CMAKE_COMMAND} -E true)
162+
else()
163+
set(BN_FIX_RPATH_COMMAND ${CMAKE_COMMAND} -DRPATH_KIND=plugin -DBINARY_PATH=${OUTPUT_FILE_PATH} -P "${BN_API_SOURCE_DIR}/cmake/SetElfRpath.cmake")
164+
endif()
160165
add_custom_command(
161166
OUTPUT ${OUTPUT_FILE_PATH}
162167
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS} --package binaryninjacore-sys
163168
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} build ${CARGO_OPTS} ${CARGO_FEATURES}
164169
COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_FILE_NAME} ${OUTPUT_FILE_PATH}
165-
COMMAND ${CMAKE_COMMAND} -DRPATH_KIND=plugin -DBINARY_PATH=${OUTPUT_FILE_PATH} -P "${BN_API_SOURCE_DIR}/cmake/SetElfRpath.cmake"
170+
COMMAND ${BN_FIX_RPATH_COMMAND}
166171
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
167172
DEPENDS ${PLUGIN_SOURCES} ${API_SOURCES}
168173
)

‎plugins/warp/CMakeLists.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,12 +171,17 @@ elseif(WIN32)
171171
)
172172
endif()
173173
else()
174+
if(DEMO)
175+
set(BN_FIX_RPATH_COMMAND ${CMAKE_COMMAND} -E true)
176+
else()
177+
set(BN_FIX_RPATH_COMMAND ${CMAKE_COMMAND} -DRPATH_KIND=plugin -DBINARY_PATH=${OUTPUT_FILE_PATH} -P "${BN_API_SOURCE_DIR}/cmake/SetElfRpath.cmake")
178+
endif()
174179
add_custom_command(
175180
OUTPUT ${OUTPUT_FILE_PATH}
176181
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS} --package binaryninjacore-sys
177182
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} build ${CARGO_OPTS} ${CARGO_FEATURES}
178183
COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_FILE_NAME} ${OUTPUT_FILE_PATH}
179-
COMMAND ${CMAKE_COMMAND} -DRPATH_KIND=plugin -DBINARY_PATH=${OUTPUT_FILE_PATH} -P "${BN_API_SOURCE_DIR}/cmake/SetElfRpath.cmake"
184+
COMMAND ${BN_FIX_RPATH_COMMAND}
180185
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
181186
DEPENDS ${PLUGIN_SOURCES} ${API_SOURCES}
182187
)

‎plugins/workflow_objc/CMakeLists.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,17 @@ elseif(WIN32)
160160
)
161161
endif()
162162
else()
163+
if(DEMO)
164+
set(BN_FIX_RPATH_COMMAND ${CMAKE_COMMAND} -E true)
165+
else()
166+
set(BN_FIX_RPATH_COMMAND ${CMAKE_COMMAND} -DRPATH_KIND=plugin -DBINARY_PATH=${OUTPUT_FILE_PATH} -P "${BN_API_SOURCE_DIR}/cmake/SetElfRpath.cmake")
167+
endif()
163168
add_custom_command(
164169
OUTPUT ${OUTPUT_FILE_PATH}
165170
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS} --package binaryninjacore-sys
166171
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} build ${CARGO_OPTS} ${CARGO_FEATURES}
167172
COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_FILE_NAME} ${OUTPUT_FILE_PATH}
168-
COMMAND ${CMAKE_COMMAND} -DRPATH_KIND=plugin -DBINARY_PATH=${OUTPUT_FILE_PATH} -P "${BN_API_SOURCE_DIR}/cmake/SetElfRpath.cmake"
173+
COMMAND ${BN_FIX_RPATH_COMMAND}
169174
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
170175
DEPENDS ${PLUGIN_SOURCES} ${API_SOURCES}
171176
)

‎plugins/workflow_swift/CMakeLists.txt‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,12 +160,17 @@ elseif(WIN32)
160160
)
161161
endif()
162162
else()
163+
if(DEMO)
164+
set(BN_FIX_RPATH_COMMAND ${CMAKE_COMMAND} -E true)
165+
else()
166+
set(BN_FIX_RPATH_COMMAND ${CMAKE_COMMAND} -DRPATH_KIND=plugin -DBINARY_PATH=${OUTPUT_FILE_PATH} -P "${BN_API_SOURCE_DIR}/cmake/SetElfRpath.cmake")
167+
endif()
163168
add_custom_command(
164169
OUTPUT ${OUTPUT_FILE_PATH}
165170
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} clean ${CARGO_OPTS} --package binaryninjacore-sys
166171
COMMAND ${CMAKE_COMMAND} -E env BINARYNINJADIR=${BINJA_LIB_DIR} ${RUSTUP_COMMAND} build ${CARGO_OPTS} ${CARGO_FEATURES}
167172
COMMAND ${CMAKE_COMMAND} -E copy ${TARGET_DIR}/${OUTPUT_FILE_NAME} ${OUTPUT_FILE_PATH}
168-
COMMAND ${CMAKE_COMMAND} -DRPATH_KIND=plugin -DBINARY_PATH=${OUTPUT_FILE_PATH} -P "${BN_API_SOURCE_DIR}/cmake/SetElfRpath.cmake"
173+
COMMAND ${BN_FIX_RPATH_COMMAND}
169174
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
170175
DEPENDS ${PLUGIN_SOURCES} ${API_SOURCES}
171176
)

0 commit comments

Comments
 (0)