Skip to content

Commit dc9c557

Browse files
committed
build: revert libelf to master state but keep config.guess copy via &&
1 parent 45d287a commit dc9c557

1 file changed

Lines changed: 2 additions & 5 deletions

File tree

CMakeLists.txt

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,14 +188,11 @@ function(toolchain_deps toolchain_deps_dir toolchain_install_dir toolchain_suffi
188188
)
189189

190190
ExternalProject_add(libelf${suffix}
191-
DEPENDS zlib${suffix}
192191
URL https://github.com/vitasdk/artifacts/releases/download/libelf-${LIBELF_VERSION}/libelf-${LIBELF_VERSION}.tar.gz
193192
URL_HASH ${LIBELF_HASH}
194193
DOWNLOAD_DIR ${DOWNLOAD_DIR}
195-
DOWNLOAD_EXTRACT_TIMESTAMP TRUE
196-
PATCH_COMMAND patch -d <SOURCE_DIR> -p3 -t -N < ${PROJECT_SOURCE_DIR}/patches/libelf.patch
197-
COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/config.guess ${PROJECT_SOURCE_DIR}/config.sub <SOURCE_DIR>/
198-
CONFIGURE_COMMAND CFLAGS=-std=gnu99 CC=${cc_compiler} RANLIB=${ranlib} ${compiler_flags} ${wrapper_command} <SOURCE_DIR>/configure
194+
PATCH_COMMAND patch -d <SOURCE_DIR> -p3 -t -N < ${PROJECT_SOURCE_DIR}/patches/libelf.patch && ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/config.guess ${PROJECT_SOURCE_DIR}/config.sub <SOURCE_DIR>/
195+
CONFIGURE_COMMAND autoreconf -i <SOURCE_DIR> COMMAND CC=${cc_compiler} RANLIB=${ranlib} ${compiler_flags} ${wrapper_command} <SOURCE_DIR>/configure
199196
--build=${build_native}
200197
--host=${toolchain_host}
201198
--prefix=${toolchain_deps_dir}

0 commit comments

Comments
 (0)