forked from hasufell/hasufell-repository
26 lines
803 B
Diff
26 lines
803 B
Diff
From 3594a934f7f142efeadaea41ee5be53983795899 Mon Sep 17 00:00:00 2001
|
|
From: Julian Ospald <hasufell@posteo.de>
|
|
Date: Sun, 16 Sep 2018 19:47:03 +0800
|
|
Subject: [PATCH 2/2] Don't call ar directly, use CMAKE_AR
|
|
|
|
---
|
|
cdk/cmake/libutils/merge_archives.cmake.in | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/cdk/cmake/libutils/merge_archives.cmake.in b/cdk/cmake/libutils/merge_archives.cmake.in
|
|
index fc58df4..e56c4b4 100644
|
|
--- a/cdk/cmake/libutils/merge_archives.cmake.in
|
|
+++ b/cdk/cmake/libutils/merge_archives.cmake.in
|
|
@@ -101,7 +101,7 @@ else()
|
|
# extract object from the library ...
|
|
|
|
execute_process(
|
|
- COMMAND ar x ../lib.a ${obj}
|
|
+ COMMAND ${CMAKE_AR} x ../lib.a ${obj}
|
|
WORKING_DIRECTORY ${MERGELIBS_DIR}/${lib}/objs
|
|
)
|
|
|
|
--
|
|
2.19.0
|
|
|