diff --git a/cmake/InstallLibTCC.cmake b/cmake/InstallLibTCC.cmake index 096f447c9..ca33a0c10 100644 --- a/cmake/InstallLibTCC.cmake +++ b/cmake/InstallLibTCC.cmake @@ -125,7 +125,7 @@ else() endif() set(LIBTCC_TARGET libtcc-depends) -set(LIBTCC_COMMIT_SHA "afc1362") +set(LIBTCC_COMMIT_SHA "6ec4a10") if(PROJECT_OS_FAMILY STREQUAL macos) # TODO: --disable-static is not working on MacOS, this should be reported or further investigated, remove this when it is solved set(LIBTTC_LIBRARY_NAME "${CMAKE_STATIC_LIBRARY_PREFIX}tcc${CMAKE_STATIC_LIBRARY_SUFFIX}") @@ -146,7 +146,7 @@ set(LIBTTC_RUNTIME_FILES ExternalProject_Add(${LIBTCC_TARGET} DOWNLOAD_NAME tinycc.tar.gz URL https://github.com/metacall/tinycc/archive/${LIBTCC_COMMIT_SHA}.tar.gz - URL_MD5 5582b17ee5848aeec28bee13773843f7 + URL_MD5 1d25d1a07a39c6d6671b7221d5286dc1 CONFIGURE_COMMAND ${LIBTCC_CONFIGURE} BUILD_COMMAND ${LIBTCC_BUILD} BUILD_IN_SOURCE true diff --git a/source/loaders/c_loader/source/c_loader_impl.cpp b/source/loaders/c_loader/source/c_loader_impl.cpp index 4ad6689bf..819bcceea 100644 --- a/source/loaders/c_loader/source/c_loader_impl.cpp +++ b/source/loaders/c_loader/source/c_loader_impl.cpp @@ -1224,7 +1224,7 @@ loader_handle c_loader_impl_load_from_file(loader_impl impl, const loader_path p } } - if (tcc_relocate(c_handle->state, TCC_RELOCATE_AUTO) == -1) + if (tcc_relocate(c_handle->state) == -1) { log_write("metacall", LOG_LEVEL_ERROR, "TCC failed to relocate"); goto error; @@ -1256,7 +1256,7 @@ loader_handle c_loader_impl_load_from_memory(loader_impl impl, const loader_name goto error; } - if (tcc_relocate(c_handle->state, TCC_RELOCATE_AUTO) == -1) + if (tcc_relocate(c_handle->state) == -1) { log_write("metacall", LOG_LEVEL_ERROR, "TCC failed to relocate"); goto error; diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh index 92cbd780f..1c1524e28 100755 --- a/tools/metacall-environment.sh +++ b/tools/metacall-environment.sh @@ -643,10 +643,10 @@ sub_java(){ # C sub_c(){ echo "configure c" + cd $ROOT_DIR + LLVM_VERSION_STRING=14 if [ "${OPERATIVE_SYSTEM}" = "Linux" ]; then - LLVM_VERSION_STRING=14 - if [ "${LINUX_DISTRO}" = "debian" ]; then UBUNTU_CODENAME="" CODENAME_FROM_ARGUMENTS=""