enable c in macos ci and updating tcc

metacall · Feb 19, 2025 · c2e77dd · c2e77dd
1 parent 952b096
commit c2e77dd
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml
@@ -77,15 +77,15 @@ jobs:
       - name: Set up the environment
         run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS
         env:
-          METACALL_INSTALL_OPTIONS: base python nodejs typescript java ruby wasm rpc file cobol go backtrace #netcore5 c rust rapidjson funchook swig pack # clangformat v8rep51 coverage
+          METACALL_INSTALL_OPTIONS: base python nodejs typescript java ruby wasm rpc file cobol go backtrace c #netcore5 rust rapidjson funchook swig pack # clangformat v8rep51 coverage
 
       - name: Configure
         run: |
           cd build
           . .env
           bash ../tools/metacall-configure.sh $METACALL_CONFIGURE_OPTIONS
         env:
-          METACALL_CONFIGURE_OPTIONS: ${{ matrix.options.build }} ${{ matrix.options.sanitizer }} scripts ports tests python nodejs typescript java ruby wasm rpc file cobol go benchmarks install # netcore5 c rust examples pack # v8 coverage
+          METACALL_CONFIGURE_OPTIONS: ${{ matrix.options.build }} ${{ matrix.options.sanitizer }} scripts ports tests python nodejs typescript java ruby wasm rpc file cobol go benchmarks install  c # netcore5 rust examples pack # v8 coverage
 
       - name: Build
         working-directory: ./build

diff --git 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 "f8bd136")
 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}")
@@ -145,8 +145,8 @@ set(LIBTTC_RUNTIME_FILES
 # LibTCC Proejct
 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					https://github.com/Bishoywadea/tinycc/archive/${LIBTCC_COMMIT_SHA}.tar.gz
+	URL_MD5				1031bd56e751ce19bae85bd86a82f107
 	CONFIGURE_COMMAND	${LIBTCC_CONFIGURE}
 	BUILD_COMMAND		${LIBTCC_BUILD}
 	BUILD_IN_SOURCE		true

diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh
@@ -696,7 +696,7 @@ sub_c(){
 			$SUDO_CMD apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/edge/testing tcc
 			$SUDO_CMD apk add --no-cache --repository=https://dl-cdn.alpinelinux.org/alpine/v3.16/main clang-libs=13.0.1-r1 clang-dev=13.0.1-r1
 		fi
-	elif [ "${OPERATIVE_SYSTEM}" = "Darwin" ]; then
+	elif [[ $OSTYPE == 'darwin'* ]]; then
 		brew install libffi
 		brew install llvm@$LLVM_VERSION_STRING
 		brew link llvm@$LLVM_VERSION_STRING --force --overwrite