diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-21 12:24:17 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-04-21 12:46:12 +0300 |
| commit | 8c38147cdd905077cab6f8a919175080e50c4f13 (patch) | |
| tree | 9ca1443fd5bb9b774556a3eb824dafa18555e307 /cmake | |
| parent | 5136295b21aac41709672c17a5a596f996a27735 (diff) | |
| parent | 87b6df31c4ae97c09dc67e370978112fe39764bb (diff) | |
| download | mariadb-git-8c38147cdd905077cab6f8a919175080e50c4f13.tar.gz | |
Merge 10.0 into 10.1
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/libutils.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/libutils.cmake b/cmake/libutils.cmake index 5125b9482cd..2e65e8b5ba3 100644 --- a/cmake/libutils.cmake +++ b/cmake/libutils.cmake @@ -188,7 +188,7 @@ MACRO(MERGE_STATIC_LIBS TARGET OUTPUT_NAME LIBS_TO_MERGE) # binaries properly) ADD_CUSTOM_COMMAND(TARGET ${TARGET} POST_BUILD COMMAND rm ${TARGET_LOCATION} - COMMAND /usr/bin/libtool -static -o ${TARGET_LOCATION} + COMMAND libtool -static -o ${TARGET_LOCATION} ${STATIC_LIBS} ) ELSE() |