Trying to enable C loader in macos.

Author: viferga

.github/workflows/macos-test.yml

@@ -81,15 +81,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 pack # clangformat v8rep51 coverage
+          METACALL_INSTALL_OPTIONS: base python nodejs typescript java ruby wasm rpc file cobol c go backtrace #netcore5 rust rapidjson 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 c go benchmarks install # netcore5 rust examples pack # v8 coverage
 
       - name: Build
         working-directory: ./build

cmake/InstallLibTCC.cmake

@@ -125,7 +125,7 @@ else()
 endif()
 
 set(LIBTCC_TARGET libtcc-depends)
-set(LIBTCC_COMMIT_SHA "6ec4a10")
+set(LIBTCC_COMMIT_SHA "518279d")
 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				1d25d1a07a39c6d6671b7221d5286dc1
+	URL_MD5				90f30075879ad6f420987549b99e5709
 	CONFIGURE_COMMAND	${LIBTCC_CONFIGURE}
 	BUILD_COMMAND		${LIBTCC_BUILD}
 	BUILD_IN_SOURCE		true

tools/metacall-environment.sh

@@ -683,8 +683,9 @@ sub_c(){
 		mkdir -p "$ROOT_DIR/build"
 		CMAKE_CONFIG_PATH="$ROOT_DIR/build/CMakeConfig.txt"
 		LIBCLANG_PREFIX=$(brew --prefix llvm@$LLVM_VERSION_STRING)
-		echo "-DLibClang_INCLUDE_DIR=${LIBCLANG_PREFIX}/include" >> $CMAKE_CONFIG_PATH
-		echo "-DLibClang_LIBRARY=${LIBCLANG_PREFIX}/lib/libclang.dylib" >> $CMAKE_CONFIG_PATH
+		LIBCLANG_VERSION=$(brew list --versions llvm@$LLVM_VERSION_STRING | awk '{print $2}')
+		echo "-DLibClang_INCLUDE_DIR=${LIBCLANG_PREFIX}/${LIBCLANG_VERSION}/lib/clang/${LIBCLANG_VERSION}/include" >> $CMAKE_CONFIG_PATH
+		echo "-DLibClang_LIBRARY=${LIBCLANG_PREFIX}/${LIBCLANG_VERSION}/lib/libclang.dylib" >> $CMAKE_CONFIG_PATH
 	fi
 }