From fb859e9812632b4fc2f16ecd179f1e62880f907c Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Tue, 6 Jun 2023 15:44:38 +0300 Subject: [PATCH 01/33] Enable Cobol [skip ci] --- .github/workflows/macos-test.yml | 4 ++-- tools/metacall-environment.sh | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index f18bc8716..61ef517c8 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -49,14 +49,14 @@ 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 #netcore5 c cobol rust rapidjson funchook swig pack # clangformat v8rep51 coverage + METACALL_INSTALL_OPTIONS: base python nodejs typescript java ruby wasm rpc file cobol #netcore5 c rust rapidjson funchook swig pack # clangformat v8rep51 coverage - name: Configure run: | cd build bash ../tools/metacall-configure.sh $METACALL_CONFIGURE_OPTIONS env: - METACALL_CONFIGURE_OPTIONS: ${{ matrix.buildtype }} scripts ports tests sanitizer python nodejs typescript java ruby wasm rpc file # netcore5 c cobol rust examples install pack benchmarks # v8 coverage + METACALL_CONFIGURE_OPTIONS: ${{ matrix.buildtype }} scripts ports tests sanitizer python nodejs typescript java ruby wasm rpc file cobol # netcore5 c rust examples install pack benchmarks # v8 coverage - name: Build working-directory: ./build diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh index c08ffbb91..f243f91b8 100755 --- a/tools/metacall-environment.sh +++ b/tools/metacall-environment.sh @@ -659,6 +659,8 @@ sub_cobol(){ # Runtime deps $SUDO_CMD apk add --no-cache db ncurses fi + elif [ "${OPERATIVE_SYSTEM}" = "Darwin" ]; then + brew install gnu-cobol fi } From f53a1467f36b4f45fda7f0e8b13e5332f8884d3e Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 19:50:14 +0300 Subject: [PATCH 02/33] SSH intro runner [skip ci] --- .github/workflows/macos-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index 61ef517c8..ae5801325 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,6 +46,9 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + - name: Set up the environment run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS env: From 3c10934b158952af2f5eac34aa6544b85b33938a Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 20:05:01 +0300 Subject: [PATCH 03/33] Fix cobol paths [skip ci] --- tools/metacall-environment.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh index f243f91b8..1b565177c 100755 --- a/tools/metacall-environment.sh +++ b/tools/metacall-environment.sh @@ -661,6 +661,12 @@ sub_cobol(){ fi elif [ "${OPERATIVE_SYSTEM}" = "Darwin" ]; then brew install gnu-cobol + mkdir -p build + CMAKE_CONFIG_PATH="$ROOT_DIR/build/CMakeConfig.txt" + COBOL_PREFIX=$(brew --prefix gnu-cobol) + echo "-DCOBOL_EXECUTABLE=${COBOL_PREFIX}/bin/cobc" >> $CMAKE_CONFIG_PATH + echo "-DCOBOL_INCLUDE_DIR=${COBOL_PREFIX}/include" >> $CMAKE_CONFIG_PATH + echo "-DCOBOL_LIBRARY=${COBOL_PREFIX}/lib/libcob.dylib" >> $CMAKE_CONFIG_PATH fi } From 983647d72470a460c0134cceb9a1bca2e978d202 Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 20:08:14 +0300 Subject: [PATCH 04/33] Fix cobol paths [skip ci] --- .github/workflows/macos-test.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index ae5801325..61ef517c8 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,9 +46,6 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - - name: Set up the environment run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS env: From 78d165ccb46bd832af74c374146acc7c723dd36a Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 20:51:46 +0300 Subject: [PATCH 05/33] SSH to try commands [skip ci] --- .github/workflows/macos-test.yml | 3 +++ tools/metacall-environment.sh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index 61ef517c8..ae5801325 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,6 +46,9 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + - name: Set up the environment run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS env: diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh index 1b565177c..7cc33f0c7 100755 --- a/tools/metacall-environment.sh +++ b/tools/metacall-environment.sh @@ -622,6 +622,9 @@ 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.14/main clang-libs=11.1.0-r1 clang-dev=11.1.0-r1 fi + elif [ "${OPERATIVE_SYSTEM}" = "Darwin" ]; then + brew install libffi + brew install tcc fi } From eb1cf482c9a2d483bf7e603abcc3f65c5d817d6e Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 21:09:18 +0300 Subject: [PATCH 06/33] Enable C [skip ci] --- .github/workflows/macos-test.yml | 7 ++----- tools/metacall-environment.sh | 4 +++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index ae5801325..671175982 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,20 +46,17 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - - 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 #netcore5 c rust rapidjson funchook swig pack # clangformat v8rep51 coverage + METACALL_INSTALL_OPTIONS: base python nodejs typescript java ruby wasm rpc file cobol c #netcore5 rust rapidjson funchook swig pack # clangformat v8rep51 coverage - name: Configure run: | cd build bash ../tools/metacall-configure.sh $METACALL_CONFIGURE_OPTIONS env: - METACALL_CONFIGURE_OPTIONS: ${{ matrix.buildtype }} scripts ports tests sanitizer python nodejs typescript java ruby wasm rpc file cobol # netcore5 c rust examples install pack benchmarks # v8 coverage + METACALL_CONFIGURE_OPTIONS: ${{ matrix.buildtype }} scripts ports tests sanitizer python nodejs typescript java ruby wasm rpc file cobol c # netcore5 rust examples install pack benchmarks # v8 coverage - name: Build working-directory: ./build diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh index 7cc33f0c7..518553c2f 100755 --- a/tools/metacall-environment.sh +++ b/tools/metacall-environment.sh @@ -624,7 +624,9 @@ sub_c(){ fi elif [ "${OPERATIVE_SYSTEM}" = "Darwin" ]; then brew install libffi - brew install tcc + brew install --HEAD tcc + brew install llvm@11 + brew link llvm@11 --force --overwrite fi } From b6b7fb8c7cc355a0ca95d75b1aada69f4c4516b6 Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 21:27:18 +0300 Subject: [PATCH 07/33] Debugging [skip ci] --- .github/workflows/macos-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index 671175982..5f0a86fd7 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,6 +46,9 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + - name: Set up the environment run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS env: From 56808bb399055d58e17ecc75016860f2da6681d7 Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 21:37:02 +0300 Subject: [PATCH 08/33] Fix tcc paths [skip ci] --- .github/workflows/macos-test.yml | 3 --- tools/metacall-environment.sh | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index 5f0a86fd7..671175982 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,9 +46,6 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - - name: Set up the environment run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS env: diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh index 518553c2f..53e2f3856 100755 --- a/tools/metacall-environment.sh +++ b/tools/metacall-environment.sh @@ -627,6 +627,11 @@ sub_c(){ brew install --HEAD tcc brew install llvm@11 brew link llvm@11 --force --overwrite + mkdir -p build + CMAKE_CONFIG_PATH="$ROOT_DIR/build/CMakeConfig.txt" + TCC_PREFIX=$(brew --prefix tcc) + echo "-DLIBTCC_LIBRARY=${TCC_PREFIX}/lib/libtcc.a" > $CMAKE_CONFIG_PATH + echo "-DLIBTCC_INCLUDE_DIR=${TCC_PREFIX}/include" >> $CMAKE_CONFIG_PATH fi } From c987122e70678e8c7600568e7f7c6ebce4940ca3 Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 22:03:49 +0300 Subject: [PATCH 09/33] Fix typo --- tools/metacall-environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh index 53e2f3856..58964f35b 100755 --- a/tools/metacall-environment.sh +++ b/tools/metacall-environment.sh @@ -630,7 +630,7 @@ sub_c(){ mkdir -p build CMAKE_CONFIG_PATH="$ROOT_DIR/build/CMakeConfig.txt" TCC_PREFIX=$(brew --prefix tcc) - echo "-DLIBTCC_LIBRARY=${TCC_PREFIX}/lib/libtcc.a" > $CMAKE_CONFIG_PATH + echo "-DLIBTCC_LIBRARY=${TCC_PREFIX}/lib/libtcc.a" >> $CMAKE_CONFIG_PATH echo "-DLIBTCC_INCLUDE_DIR=${TCC_PREFIX}/include" >> $CMAKE_CONFIG_PATH fi } From 559970ac7134a6fe314fdf265f30e927dfb036d1 Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 22:32:28 +0300 Subject: [PATCH 10/33] more debugging [skip ci] --- .github/workflows/macos-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index 671175982..5f0a86fd7 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,6 +46,9 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + - name: Set up the environment run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS env: From 344b90395683db2345b204b515d7bacd54a5e6a7 Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 22:48:57 +0300 Subject: [PATCH 11/33] Add libclang paths [skip ci] --- .github/workflows/macos-test.yml | 3 --- tools/metacall-environment.sh | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index 5f0a86fd7..671175982 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,9 +46,6 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - - name: Set up the environment run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS env: diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh index 58964f35b..9c6657e04 100755 --- a/tools/metacall-environment.sh +++ b/tools/metacall-environment.sh @@ -630,8 +630,12 @@ sub_c(){ mkdir -p build CMAKE_CONFIG_PATH="$ROOT_DIR/build/CMakeConfig.txt" TCC_PREFIX=$(brew --prefix tcc) + LIBC_PREFIX=$(brew --prefix llvm@11) echo "-DLIBTCC_LIBRARY=${TCC_PREFIX}/lib/libtcc.a" >> $CMAKE_CONFIG_PATH echo "-DLIBTCC_INCLUDE_DIR=${TCC_PREFIX}/include" >> $CMAKE_CONFIG_PATH + echo "-DLibClang_INCLUDE_DIR=${LIBC_PREFIX}/include/clang-c" >> $CMAKE_CONFIG_PATH + echo "-DLibClang_LIBRARY=${LIBC_PREFIX}/lib/libclang.dylib" >> $CMAKE_CONFIG_PATH + fi } From 4b84e37d20967ffcb8abb69c3a32a0332ce86ac6 Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 19:50:14 +0300 Subject: [PATCH 12/33] SSH intro runner [skip ci] --- .github/workflows/macos-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index 61ef517c8..ae5801325 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,6 +46,9 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + - name: Set up the environment run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS env: From 826a31853784d352d15afb3489c3449a286fc627 Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 20:08:14 +0300 Subject: [PATCH 13/33] Fix cobol paths [skip ci] --- .github/workflows/macos-test.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index ae5801325..61ef517c8 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,9 +46,6 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - - name: Set up the environment run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS env: From 72eb50c42b560f41aed70d1613fce92bb750a3b7 Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 20:51:46 +0300 Subject: [PATCH 14/33] SSH to try commands [skip ci] --- .github/workflows/macos-test.yml | 3 +++ tools/metacall-environment.sh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index 61ef517c8..ae5801325 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,6 +46,9 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + - name: Set up the environment run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS env: diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh index 575f8b17b..2d95eeb84 100755 --- a/tools/metacall-environment.sh +++ b/tools/metacall-environment.sh @@ -625,6 +625,9 @@ 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.14/main clang-libs=11.1.0-r1 clang-dev=11.1.0-r1 fi + elif [ "${OPERATIVE_SYSTEM}" = "Darwin" ]; then + brew install libffi + brew install tcc fi } From 3c861d500c6f0446c1a52121e8ebd765cacc5699 Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 21:09:18 +0300 Subject: [PATCH 15/33] Enable C [skip ci] --- .github/workflows/macos-test.yml | 7 ++----- tools/metacall-environment.sh | 4 +++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index ae5801325..671175982 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,20 +46,17 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - - 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 #netcore5 c rust rapidjson funchook swig pack # clangformat v8rep51 coverage + METACALL_INSTALL_OPTIONS: base python nodejs typescript java ruby wasm rpc file cobol c #netcore5 rust rapidjson funchook swig pack # clangformat v8rep51 coverage - name: Configure run: | cd build bash ../tools/metacall-configure.sh $METACALL_CONFIGURE_OPTIONS env: - METACALL_CONFIGURE_OPTIONS: ${{ matrix.buildtype }} scripts ports tests sanitizer python nodejs typescript java ruby wasm rpc file cobol # netcore5 c rust examples install pack benchmarks # v8 coverage + METACALL_CONFIGURE_OPTIONS: ${{ matrix.buildtype }} scripts ports tests sanitizer python nodejs typescript java ruby wasm rpc file cobol c # netcore5 rust examples install pack benchmarks # v8 coverage - name: Build working-directory: ./build diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh index 2d95eeb84..01746f6e0 100755 --- a/tools/metacall-environment.sh +++ b/tools/metacall-environment.sh @@ -627,7 +627,9 @@ sub_c(){ fi elif [ "${OPERATIVE_SYSTEM}" = "Darwin" ]; then brew install libffi - brew install tcc + brew install --HEAD tcc + brew install llvm@11 + brew link llvm@11 --force --overwrite fi } From 833a97a7a5fb25b41c1084fde917974e2e2d3432 Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 21:27:18 +0300 Subject: [PATCH 16/33] Debugging [skip ci] --- .github/workflows/macos-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index 671175982..5f0a86fd7 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,6 +46,9 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + - name: Set up the environment run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS env: From f509251734807a6fc34ce811a2440a7fe6081e82 Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 21:37:02 +0300 Subject: [PATCH 17/33] Fix tcc paths [skip ci] --- .github/workflows/macos-test.yml | 3 --- tools/metacall-environment.sh | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index 5f0a86fd7..671175982 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,9 +46,6 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - - name: Set up the environment run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS env: diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh index 01746f6e0..f3864109f 100755 --- a/tools/metacall-environment.sh +++ b/tools/metacall-environment.sh @@ -630,6 +630,11 @@ sub_c(){ brew install --HEAD tcc brew install llvm@11 brew link llvm@11 --force --overwrite + mkdir -p build + CMAKE_CONFIG_PATH="$ROOT_DIR/build/CMakeConfig.txt" + TCC_PREFIX=$(brew --prefix tcc) + echo "-DLIBTCC_LIBRARY=${TCC_PREFIX}/lib/libtcc.a" > $CMAKE_CONFIG_PATH + echo "-DLIBTCC_INCLUDE_DIR=${TCC_PREFIX}/include" >> $CMAKE_CONFIG_PATH fi } From 211149bff527fb3b7575c6a501426ab483d1a2d6 Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 22:03:49 +0300 Subject: [PATCH 18/33] Fix typo --- tools/metacall-environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh index f3864109f..cec14c57f 100755 --- a/tools/metacall-environment.sh +++ b/tools/metacall-environment.sh @@ -633,7 +633,7 @@ sub_c(){ mkdir -p build CMAKE_CONFIG_PATH="$ROOT_DIR/build/CMakeConfig.txt" TCC_PREFIX=$(brew --prefix tcc) - echo "-DLIBTCC_LIBRARY=${TCC_PREFIX}/lib/libtcc.a" > $CMAKE_CONFIG_PATH + echo "-DLIBTCC_LIBRARY=${TCC_PREFIX}/lib/libtcc.a" >> $CMAKE_CONFIG_PATH echo "-DLIBTCC_INCLUDE_DIR=${TCC_PREFIX}/include" >> $CMAKE_CONFIG_PATH fi } From c0b22a5dc81937d2c501d62c3a6daa4404f30b35 Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 22:32:28 +0300 Subject: [PATCH 19/33] more debugging [skip ci] --- .github/workflows/macos-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index 671175982..5f0a86fd7 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,6 +46,9 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + - name: Set up the environment run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS env: From 34c8b22c7c573884d1a5a5f21174ffa1223299c2 Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 22:48:57 +0300 Subject: [PATCH 20/33] Add libclang paths [skip ci] --- .github/workflows/macos-test.yml | 3 --- tools/metacall-environment.sh | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index 5f0a86fd7..671175982 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,9 +46,6 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - - name: Set up the environment run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS env: diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh index cec14c57f..ce1bd07b2 100755 --- a/tools/metacall-environment.sh +++ b/tools/metacall-environment.sh @@ -633,8 +633,12 @@ sub_c(){ mkdir -p build CMAKE_CONFIG_PATH="$ROOT_DIR/build/CMakeConfig.txt" TCC_PREFIX=$(brew --prefix tcc) + LIBC_PREFIX=$(brew --prefix llvm@11) echo "-DLIBTCC_LIBRARY=${TCC_PREFIX}/lib/libtcc.a" >> $CMAKE_CONFIG_PATH echo "-DLIBTCC_INCLUDE_DIR=${TCC_PREFIX}/include" >> $CMAKE_CONFIG_PATH + echo "-DLibClang_INCLUDE_DIR=${LIBC_PREFIX}/include/clang-c" >> $CMAKE_CONFIG_PATH + echo "-DLibClang_LIBRARY=${LIBC_PREFIX}/lib/libclang.dylib" >> $CMAKE_CONFIG_PATH + fi } From f1ce6e4bd10115efd3c5af470727d7824db3a096 Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 15 Jun 2023 18:59:59 +0300 Subject: [PATCH 21/33] Remove Tcc installation [skip ci] --- tools/metacall-environment.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh index ce1bd07b2..5f4b06b88 100755 --- a/tools/metacall-environment.sh +++ b/tools/metacall-environment.sh @@ -627,15 +627,12 @@ sub_c(){ fi elif [ "${OPERATIVE_SYSTEM}" = "Darwin" ]; then brew install libffi - brew install --HEAD tcc brew install llvm@11 brew link llvm@11 --force --overwrite mkdir -p build CMAKE_CONFIG_PATH="$ROOT_DIR/build/CMakeConfig.txt" TCC_PREFIX=$(brew --prefix tcc) LIBC_PREFIX=$(brew --prefix llvm@11) - echo "-DLIBTCC_LIBRARY=${TCC_PREFIX}/lib/libtcc.a" >> $CMAKE_CONFIG_PATH - echo "-DLIBTCC_INCLUDE_DIR=${TCC_PREFIX}/include" >> $CMAKE_CONFIG_PATH echo "-DLibClang_INCLUDE_DIR=${LIBC_PREFIX}/include/clang-c" >> $CMAKE_CONFIG_PATH echo "-DLibClang_LIBRARY=${LIBC_PREFIX}/lib/libclang.dylib" >> $CMAKE_CONFIG_PATH From 532f06afdace452ecd20eb4520073c9c9317f510 Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 15 Jun 2023 19:44:10 +0300 Subject: [PATCH 22/33] fix Tcc installation [skip ci] --- cmake/InstallLibTCC.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/InstallLibTCC.cmake b/cmake/InstallLibTCC.cmake index debb84af8..4ea818810 100644 --- a/cmake/InstallLibTCC.cmake +++ b/cmake/InstallLibTCC.cmake @@ -40,7 +40,7 @@ else() endif() # Configure -if(PROJECT_OS_FAMILY STREQUAL unix) +if(PROJECT_OS_FAMILY STREQUAL unix OR PROJECT_OS_FAMILY STREQUAL macos) if(OPTION_BUILD_MUSL) set(LIBTCC_CONFIGURE ./configure --prefix=${LIBTCC_INSTALL_PREFIX} ${LIBTCC_DEBUG} --disable-static --config-musl) else() @@ -62,7 +62,7 @@ ProcessorCount(N) # Build if(PROJECT_OS_BSD) set(LIBTCC_BUILD gmake -j${N}) -elseif(PROJECT_OS_FAMILY STREQUAL unix) +elseif(PROJECT_OS_FAMILY STREQUAL unix OR PROJECT_OS_FAMILY STREQUAL macos) set(LIBTCC_BUILD make -j${N}) elseif(PROJECT_OS_FAMILY STREQUAL win32) if(PROJECT_OS_NAME STREQUAL MinGW) From fe50ed509fcf39c325fbb9a87e30d519b180a714 Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 19:50:14 +0300 Subject: [PATCH 23/33] SSH intro runner [skip ci] --- .github/workflows/macos-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index 61ef517c8..ae5801325 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,6 +46,9 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + - name: Set up the environment run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS env: From 0998166e9da98a7d6526f2350bcb4945d1b8f275 Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 20:08:14 +0300 Subject: [PATCH 24/33] Fix cobol paths [skip ci] --- .github/workflows/macos-test.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index ae5801325..61ef517c8 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,9 +46,6 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - - name: Set up the environment run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS env: From 11747f2cfc5cc62002ee18606b10d4100d4d26bd Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 20:51:46 +0300 Subject: [PATCH 25/33] SSH to try commands [skip ci] --- .github/workflows/macos-test.yml | 3 +++ tools/metacall-environment.sh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index 61ef517c8..ae5801325 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,6 +46,9 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + - name: Set up the environment run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS env: diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh index 575f8b17b..2d95eeb84 100755 --- a/tools/metacall-environment.sh +++ b/tools/metacall-environment.sh @@ -625,6 +625,9 @@ 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.14/main clang-libs=11.1.0-r1 clang-dev=11.1.0-r1 fi + elif [ "${OPERATIVE_SYSTEM}" = "Darwin" ]; then + brew install libffi + brew install tcc fi } From 7bba52e60c5cdd56344730b4c348ff9292e701b6 Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 21:09:18 +0300 Subject: [PATCH 26/33] Enable C [skip ci] --- .github/workflows/macos-test.yml | 7 ++----- tools/metacall-environment.sh | 4 +++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index ae5801325..671175982 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,20 +46,17 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - - 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 #netcore5 c rust rapidjson funchook swig pack # clangformat v8rep51 coverage + METACALL_INSTALL_OPTIONS: base python nodejs typescript java ruby wasm rpc file cobol c #netcore5 rust rapidjson funchook swig pack # clangformat v8rep51 coverage - name: Configure run: | cd build bash ../tools/metacall-configure.sh $METACALL_CONFIGURE_OPTIONS env: - METACALL_CONFIGURE_OPTIONS: ${{ matrix.buildtype }} scripts ports tests sanitizer python nodejs typescript java ruby wasm rpc file cobol # netcore5 c rust examples install pack benchmarks # v8 coverage + METACALL_CONFIGURE_OPTIONS: ${{ matrix.buildtype }} scripts ports tests sanitizer python nodejs typescript java ruby wasm rpc file cobol c # netcore5 rust examples install pack benchmarks # v8 coverage - name: Build working-directory: ./build diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh index 2d95eeb84..01746f6e0 100755 --- a/tools/metacall-environment.sh +++ b/tools/metacall-environment.sh @@ -627,7 +627,9 @@ sub_c(){ fi elif [ "${OPERATIVE_SYSTEM}" = "Darwin" ]; then brew install libffi - brew install tcc + brew install --HEAD tcc + brew install llvm@11 + brew link llvm@11 --force --overwrite fi } From bd2c2bc676e1d6795c34f5405bfb65383ffca130 Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 21:27:18 +0300 Subject: [PATCH 27/33] Debugging [skip ci] --- .github/workflows/macos-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index 671175982..5f0a86fd7 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,6 +46,9 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + - name: Set up the environment run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS env: From d6825a2197ce72e912b6ed378810db05d60a482b Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 21:37:02 +0300 Subject: [PATCH 28/33] Fix tcc paths [skip ci] --- .github/workflows/macos-test.yml | 3 --- tools/metacall-environment.sh | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index 5f0a86fd7..671175982 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,9 +46,6 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - - name: Set up the environment run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS env: diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh index 01746f6e0..f3864109f 100755 --- a/tools/metacall-environment.sh +++ b/tools/metacall-environment.sh @@ -630,6 +630,11 @@ sub_c(){ brew install --HEAD tcc brew install llvm@11 brew link llvm@11 --force --overwrite + mkdir -p build + CMAKE_CONFIG_PATH="$ROOT_DIR/build/CMakeConfig.txt" + TCC_PREFIX=$(brew --prefix tcc) + echo "-DLIBTCC_LIBRARY=${TCC_PREFIX}/lib/libtcc.a" > $CMAKE_CONFIG_PATH + echo "-DLIBTCC_INCLUDE_DIR=${TCC_PREFIX}/include" >> $CMAKE_CONFIG_PATH fi } From 0263c05e6502b9ef496912bae69c88d27a111d46 Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 22:03:49 +0300 Subject: [PATCH 29/33] Fix typo --- tools/metacall-environment.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh index f3864109f..cec14c57f 100755 --- a/tools/metacall-environment.sh +++ b/tools/metacall-environment.sh @@ -633,7 +633,7 @@ sub_c(){ mkdir -p build CMAKE_CONFIG_PATH="$ROOT_DIR/build/CMakeConfig.txt" TCC_PREFIX=$(brew --prefix tcc) - echo "-DLIBTCC_LIBRARY=${TCC_PREFIX}/lib/libtcc.a" > $CMAKE_CONFIG_PATH + echo "-DLIBTCC_LIBRARY=${TCC_PREFIX}/lib/libtcc.a" >> $CMAKE_CONFIG_PATH echo "-DLIBTCC_INCLUDE_DIR=${TCC_PREFIX}/include" >> $CMAKE_CONFIG_PATH fi } From e07deb320d02ae7e0e6fc1dd3874f2e24a002dd0 Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 22:32:28 +0300 Subject: [PATCH 30/33] more debugging [skip ci] --- .github/workflows/macos-test.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index 671175982..5f0a86fd7 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,6 +46,9 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 + - name: Set up the environment run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS env: From d222b283702ec72356d88108f26afe206aed80a7 Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 8 Jun 2023 22:48:57 +0300 Subject: [PATCH 31/33] Add libclang paths [skip ci] --- .github/workflows/macos-test.yml | 3 --- tools/metacall-environment.sh | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/macos-test.yml b/.github/workflows/macos-test.yml index 5f0a86fd7..671175982 100644 --- a/.github/workflows/macos-test.yml +++ b/.github/workflows/macos-test.yml @@ -46,9 +46,6 @@ jobs: RUBY_FRAMEWORK_DIR=$(xcrun --sdk macosx --show-sdk-path)/System/Library/Frameworks/Ruby.framework sudo rm -rf $RUBY_FRAMEWORK_DIR - - name: Setup tmate session - uses: mxschmitt/action-tmate@v3 - - name: Set up the environment run: sh ./tools/metacall-environment.sh $METACALL_INSTALL_OPTIONS env: diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh index cec14c57f..ce1bd07b2 100755 --- a/tools/metacall-environment.sh +++ b/tools/metacall-environment.sh @@ -633,8 +633,12 @@ sub_c(){ mkdir -p build CMAKE_CONFIG_PATH="$ROOT_DIR/build/CMakeConfig.txt" TCC_PREFIX=$(brew --prefix tcc) + LIBC_PREFIX=$(brew --prefix llvm@11) echo "-DLIBTCC_LIBRARY=${TCC_PREFIX}/lib/libtcc.a" >> $CMAKE_CONFIG_PATH echo "-DLIBTCC_INCLUDE_DIR=${TCC_PREFIX}/include" >> $CMAKE_CONFIG_PATH + echo "-DLibClang_INCLUDE_DIR=${LIBC_PREFIX}/include/clang-c" >> $CMAKE_CONFIG_PATH + echo "-DLibClang_LIBRARY=${LIBC_PREFIX}/lib/libclang.dylib" >> $CMAKE_CONFIG_PATH + fi } From 84b05ff36c820b4d0d52c60796291f998a14806d Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 15 Jun 2023 18:59:59 +0300 Subject: [PATCH 32/33] Remove Tcc installation [skip ci] --- tools/metacall-environment.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/metacall-environment.sh b/tools/metacall-environment.sh index ce1bd07b2..5f4b06b88 100755 --- a/tools/metacall-environment.sh +++ b/tools/metacall-environment.sh @@ -627,15 +627,12 @@ sub_c(){ fi elif [ "${OPERATIVE_SYSTEM}" = "Darwin" ]; then brew install libffi - brew install --HEAD tcc brew install llvm@11 brew link llvm@11 --force --overwrite mkdir -p build CMAKE_CONFIG_PATH="$ROOT_DIR/build/CMakeConfig.txt" TCC_PREFIX=$(brew --prefix tcc) LIBC_PREFIX=$(brew --prefix llvm@11) - echo "-DLIBTCC_LIBRARY=${TCC_PREFIX}/lib/libtcc.a" >> $CMAKE_CONFIG_PATH - echo "-DLIBTCC_INCLUDE_DIR=${TCC_PREFIX}/include" >> $CMAKE_CONFIG_PATH echo "-DLibClang_INCLUDE_DIR=${LIBC_PREFIX}/include/clang-c" >> $CMAKE_CONFIG_PATH echo "-DLibClang_LIBRARY=${LIBC_PREFIX}/lib/libclang.dylib" >> $CMAKE_CONFIG_PATH From 7da6cf9904b6e3c32c9f8c39861ee023aefb94ed Mon Sep 17 00:00:00 2001 From: ahmedihabb2 Date: Thu, 15 Jun 2023 19:44:10 +0300 Subject: [PATCH 33/33] fix Tcc installation [skip ci] --- cmake/InstallLibTCC.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/InstallLibTCC.cmake b/cmake/InstallLibTCC.cmake index debb84af8..4ea818810 100644 --- a/cmake/InstallLibTCC.cmake +++ b/cmake/InstallLibTCC.cmake @@ -40,7 +40,7 @@ else() endif() # Configure -if(PROJECT_OS_FAMILY STREQUAL unix) +if(PROJECT_OS_FAMILY STREQUAL unix OR PROJECT_OS_FAMILY STREQUAL macos) if(OPTION_BUILD_MUSL) set(LIBTCC_CONFIGURE ./configure --prefix=${LIBTCC_INSTALL_PREFIX} ${LIBTCC_DEBUG} --disable-static --config-musl) else() @@ -62,7 +62,7 @@ ProcessorCount(N) # Build if(PROJECT_OS_BSD) set(LIBTCC_BUILD gmake -j${N}) -elseif(PROJECT_OS_FAMILY STREQUAL unix) +elseif(PROJECT_OS_FAMILY STREQUAL unix OR PROJECT_OS_FAMILY STREQUAL macos) set(LIBTCC_BUILD make -j${N}) elseif(PROJECT_OS_FAMILY STREQUAL win32) if(PROJECT_OS_NAME STREQUAL MinGW)