Skip to content

Commit 95a2663

Browse files
Bishoywadeaviferga
andauthored
fxing linux ci after updating tinycc (#553)
* adding C to macos CI and updating tcc commit sha * adding branch to ci triggers * modifying md5 hash for tinycc * typo in MD5 * replace TCC_RELOCATE_AUTO in the code * update code according to new signature of tcc_relocate function * remove branch name from macos ci * remove branch from linux ci * remove branch from windows ci * remove c from macos ci * Update metacall-environment.sh --------- Co-authored-by: Vicente Eduardo Ferrer Garcia <[email protected]>
1 parent 9bb0a6c commit 95a2663

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

cmake/InstallLibTCC.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ else()
125125
endif()
126126

127127
set(LIBTCC_TARGET libtcc-depends)
128-
set(LIBTCC_COMMIT_SHA "afc1362")
128+
set(LIBTCC_COMMIT_SHA "6ec4a10")
129129
if(PROJECT_OS_FAMILY STREQUAL macos)
130130
# TODO: --disable-static is not working on MacOS, this should be reported or further investigated, remove this when it is solved
131131
set(LIBTTC_LIBRARY_NAME "${CMAKE_STATIC_LIBRARY_PREFIX}tcc${CMAKE_STATIC_LIBRARY_SUFFIX}")
@@ -146,7 +146,7 @@ set(LIBTTC_RUNTIME_FILES
146146
ExternalProject_Add(${LIBTCC_TARGET}
147147
DOWNLOAD_NAME tinycc.tar.gz
148148
URL https://github.com/metacall/tinycc/archive/${LIBTCC_COMMIT_SHA}.tar.gz
149-
URL_MD5 5582b17ee5848aeec28bee13773843f7
149+
URL_MD5 1d25d1a07a39c6d6671b7221d5286dc1
150150
CONFIGURE_COMMAND ${LIBTCC_CONFIGURE}
151151
BUILD_COMMAND ${LIBTCC_BUILD}
152152
BUILD_IN_SOURCE true

source/loaders/c_loader/source/c_loader_impl.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,7 +1224,7 @@ loader_handle c_loader_impl_load_from_file(loader_impl impl, const loader_path p
12241224
}
12251225
}
12261226

1227-
if (tcc_relocate(c_handle->state, TCC_RELOCATE_AUTO) == -1)
1227+
if (tcc_relocate(c_handle->state) == -1)
12281228
{
12291229
log_write("metacall", LOG_LEVEL_ERROR, "TCC failed to relocate");
12301230
goto error;
@@ -1256,7 +1256,7 @@ loader_handle c_loader_impl_load_from_memory(loader_impl impl, const loader_name
12561256
goto error;
12571257
}
12581258

1259-
if (tcc_relocate(c_handle->state, TCC_RELOCATE_AUTO) == -1)
1259+
if (tcc_relocate(c_handle->state) == -1)
12601260
{
12611261
log_write("metacall", LOG_LEVEL_ERROR, "TCC failed to relocate");
12621262
goto error;

tools/metacall-environment.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -643,10 +643,10 @@ sub_java(){
643643
# C
644644
sub_c(){
645645
echo "configure c"
646+
cd $ROOT_DIR
647+
LLVM_VERSION_STRING=14
646648

647649
if [ "${OPERATIVE_SYSTEM}" = "Linux" ]; then
648-
LLVM_VERSION_STRING=14
649-
650650
if [ "${LINUX_DISTRO}" = "debian" ]; then
651651
UBUNTU_CODENAME=""
652652
CODENAME_FROM_ARGUMENTS=""

0 commit comments

Comments
 (0)