Merge branch 'stable' of https://git.mixedup.dev/ReFuel/docker-cross-compiler into stable

Rename additional cmake variable.
Update build_native to honor build options.
2024-06-20 12:57:36 +03:00 · 2024-06-20 12:45:58 +03:00 · 2024-06-14 22:11:22 +03:00 · 2024-06-14 22:00:05 +03:00 · 2024-06-14 21:52:51 +03:00 · 2024-06-13 20:57:08 +03:00
3 changed files with 4 additions and 6 deletions
--- a/cmake/osx-arm64.cmake
+++ b/cmake/osx-arm64.cmake
@@ -1,7 +1,7 @@
 # ReFuel Toolchain file for OSX-ARM64 systems.
 # Copyright (C) 2024

-set(CMAKE_SYSTEM_NAME OSX)
+set(CMAKE_SYSTEM_NAME Darwin)

 set(CMAKE_C_COMPILER aarch64-apple-darwin23-clang)
 set(CMAKE_CXX_COMPILER aarch64-apple-darwin23-clang++)
--- a/cmake/osx-x64.cmake
+++ b/cmake/osx-x64.cmake
@@ -1,7 +1,7 @@
 # ReFuel Toolchain file for OSX-ARM64 systems.
 # Copyright (C) 2024

-set(CMAKE_SYSTEM_NAME OSX)
+set(CMAKE_SYSTEM_NAME Darwin)

 set(CMAKE_C_COMPILER x86_64-apple-darwin23-clang)
 set(CMAKE_CXX_COMPILER x86_64-apple-darwin23-clang++)
--- a/sh/build_native.sh
+++ b/sh/build_native.sh
@@ -16,7 +16,7 @@ fi

 if [ -z "$ARCHS" ]
 then
-    ARCHS="linux-arm linux-arm64 linux-x64 win-x64 win-x86"
+    ARCHS="linux-arm linux-arm64 linux-x64 win-x64 win-x86 osx-arm64 osx-x64"
 fi

 if [ -z "$DST" ]
@@ -43,11 +43,9 @@ for ARCH in $ARCHS; do
    cmake -B $BUILD -S $SRC \
        -G Ninja \
        -DCMAKE_BUILD_TYPE=Release \
-        -DCMAKE_C_FLAGS=-static-libgcc \
-        -DCMAKE_CXX_FLAGS=-static-libgcc \
        -DCMAKE_INSTALL_PREFIX=$PREFIX \
        -DCMAKE_TOOLCHAIN_FILE=$TOOLCHAIN \
-        $QUIK_ADDITIONAL_CMAKE
+        $REFUEL_ADDITIONAL_CMAKE

    # Build and install.
    ninja -C $BUILD all
Author	SHA1	Message	Date
H. Utku Maden	518969e2c9	Merge branch 'stable' of https://git.mixedup.dev/ReFuel/docker-cross-compiler into stable All checks were successful Build / build (push) Successful in 36s Details	2024-06-20 12:57:36 +03:00
H. Utku Maden	3b4d6cee18	Rename additional cmake variable.	2024-06-20 12:45:58 +03:00
H. Utku Maden	5901e3e317	Update build_native to honor build options.	2024-06-14 22:11:22 +03:00
H. Utku Maden	44c8ab3212	Update the cmake scripts by copying the correct commit.	2024-06-14 22:00:05 +03:00
H. Utku Maden	36660bcf38	Add osx options again.	2024-06-14 21:52:51 +03:00
H. Utku Maden	4107bf9df4	Rebrand as ReFuel. Some checks failed Build / build (push) Failing after 30s Details	2024-06-13 20:57:08 +03:00
H. Utku Maden	fe004342de	Reintroduce build essentials into this repository.	2024-06-13 20:49:00 +03:00
H. Utku Maden	9eb5f90a2e	Merge branch 'stable' of https://git.mixedup.dev/QUIK/docker-cross-compiler into stable All checks were successful Build / build (push) Successful in 25m12s Details	2024-03-30 14:34:19 +03:00
H. Utku Maden	ac01f7f2aa	[v1.0] Add automatic build action. All checks were successful Build / build (push) Successful in 34s Details Try adding secrets to the workflow script. Fix workflow. Fix typo. fix docker name conflict. Removed cmake files from this repository and added node and meson to the apt packages list. Update .gitea/workflows/build.yaml node -> nodejs	2024-03-23 11:33:28 +03:00