Update tinycc image

Update tinycc image Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
Use env variable instead hardcoded variable in toolchain.cmake
2025-06-17 16:39:25 +02:00 · 2021-08-12 22:37:43 +02:00 · 2021-08-12 21:38:43 +02:00 · 2021-08-12 02:31:50 +02:00 · 2021-08-11 15:55:51 -04:00 · 2021-08-11 15:48:36 -04:00
22 changed files with 55 additions and 41 deletions
--- a/README.md
+++ b/README.md
@ -102,6 +102,7 @@ The dockcross script will execute the given command-line inside the container, a
 | dockcross/linux-x86 | x86 | GCC | Linux |
 | dockcross/linux-x64 | x86_64 | GCC | Linux |
 | dockcross/linux-x64-clang | x86_64 | Clang | Linux |
+| dockcross/linux-x64-tinycc | x86_64 | tinycc + GCC | Linux |
 | dockcross/web-wasm | JS | LLVM | Web (JS) |
 | dockcross/windows-shared-x86 | x86 | GCC | Windows |
 | dockcross/windows-shared-x64 | x86_64 | GCC | Windows |
@ -271,6 +272,12 @@ Linux clang x86_64/amd64 compiler. Since the Docker image is natively x86_64, th

 Linux i686 cross compiler.

+### dockcross/linux-x64-tinycc
+
+![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/linux-x64-tinycc/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/linux-x64-tinycc)
+
+Linux tcc compiler for C compiler, and GCC for C++ compiler, for linux x86_64/amd64 arch.
+
 ### dockcross/manylinux2014-x64

 ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/dockcross/manylinux2014-x64/latest) ![Docker Pulls](https://img.shields.io/docker/pulls/dockcross/manylinux2014-x64)
--- a/android-arm/Toolchain.cmake
+++ b/android-arm/Toolchain.cmake
@ -3,7 +3,7 @@ set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR armv7-a)
 set(CMAKE_ANDROID_ARCH_ABI armeabi-v7a)

-set(cross_triple arm-linux-androideabi)
+set(cross_triple $ENV{CROSS_TRIPLE})
 set(CMAKE_ANDROID_STANDALONE_TOOLCHAIN $ENV{CROSS_ROOT})
 set(CMAKE_ANDROID_ARM_MODE ON)
 set(CMAKE_ANDROID_ARM_NEON ON)
--- a/android-arm64/Toolchain.cmake
+++ b/android-arm64/Toolchain.cmake
@ -3,7 +3,7 @@ set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR aarch64)
 set(CMAKE_ANDROID_ARCH_ABI arm64-v8a)

-set(cross_triple aarch64-linux-android)
+set(cross_triple $ENV{CROSS_TRIPLE})
 set(CMAKE_ANDROID_STANDALONE_TOOLCHAIN $ENV{CROSS_ROOT})
 set(CMAKE_ANDROID_ARM_MODE ON)
 set(CMAKE_ANDROID_ARM_NEON ON)
--- a/android-x86/Toolchain.cmake
+++ b/android-x86/Toolchain.cmake
@ -3,7 +3,7 @@ set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR i686)
 set(CMAKE_ANDROID_ARCH_ABI x86)

-set(cross_triple i686-linux-android)
+set(cross_triple $ENV{CROSS_TRIPLE})
 set(CMAKE_ANDROID_STANDALONE_TOOLCHAIN $ENV{CROSS_ROOT})
 set(CMAKE_ANDROID_ARM_MODE ON)
 set(CMAKE_ANDROID_ARM_NEON ON)
--- a/android-x86_64/Toolchain.cmake
+++ b/android-x86_64/Toolchain.cmake
@ -3,7 +3,7 @@ set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR x86_64)
 set(CMAKE_ANDROID_ARCH_ABI x86_64)

-set(cross_triple x86_64-linux-android)
+set(cross_triple $ENV{CROSS_TRIPLE})
 set(CMAKE_ANDROID_STANDALONE_TOOLCHAIN $ENV{CROSS_ROOT})
 set(CMAKE_ANDROID_ARM_MODE ON)
 set(CMAKE_ANDROID_ARM_NEON ON)
--- a/linux-arm64-full/Toolchain.cmake
+++ b/linux-arm64-full/Toolchain.cmake
@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR aarch64)

-set(cross_triple "aarch64-buildroot-linux-gnu")
-set(cross_root /buildroot)
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})

 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
@ -13,9 +13,8 @@ set(CMAKE_CXX_FLAGS "-I ${cross_root}/include/")

 set(CMAKE_FIND_ROOT_PATH ${cross_root} ${cross_root}/${cross_triple})
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
-set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)

 set(CMAKE_SYSROOT ${cross_root}/${cross_triple}/sysroot)

--- a/linux-armv5/Toolchain.cmake
+++ b/linux-armv5/Toolchain.cmake
@ -1,8 +1,9 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR arm)
-set(cross_triple "armv5-unknown-linux-gnueabi")
-set(cross_root /usr/xcc/${cross_triple})
+
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})

 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
--- a/linux-armv6-lts/Toolchain.cmake
+++ b/linux-armv6-lts/Toolchain.cmake
@ -1,8 +1,9 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR arm)
-set(cross_triple "armv6-unknown-linux-gnueabihf")
-set(cross_root /usr/xcc/${cross_triple})
+
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})

 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
--- a/linux-armv7/Toolchain.cmake
+++ b/linux-armv7/Toolchain.cmake
@ -1,8 +1,9 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR arm)
-set(cross_triple "armv7-unknown-linux-gnueabi")
-set(cross_root /usr/xcc/${cross_triple})
+
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})

 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
--- a/linux-armv7a/Toolchain.cmake
+++ b/linux-armv7a/Toolchain.cmake
@ -1,8 +1,9 @@
 set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR arm)
-set(cross_triple "arm-cortexa8_neon-linux-gnueabihf")
-set(cross_root /usr/xcc/${cross_triple})
+
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})

 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
--- a/linux-m68k-uclibc/Toolchain.cmake
+++ b/linux-m68k-uclibc/Toolchain.cmake
@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR mk68)

-set(cross_triple "m68k-unknown-uclinux-uclibc")
-set(cross_root /usr/xcc/${cross_triple})
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})

 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
--- a/linux-mips/Toolchain.cmake
+++ b/linux-mips/Toolchain.cmake
@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR mips)

-set(cross_triple "mips-unknown-linux-gnu")
-set(cross_root /usr/xcc/${cross_triple})
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})

 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
--- a/linux-ppc64le/Toolchain.cmake
+++ b/linux-ppc64le/Toolchain.cmake
@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR ppc64le)

-set(cross_triple "powerpc64le-unknown-linux-gnu")
-set(cross_root /usr/xcc/${cross_triple})
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})

 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
--- a/linux-riscv32/Toolchain.cmake
+++ b/linux-riscv32/Toolchain.cmake
@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR riscv32)

-set(cross_triple "riscv32-unknown-linux-gnu")
-set(cross_root /usr/xcc/${cross_triple})
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})

 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
--- a/linux-riscv64/Toolchain.cmake
+++ b/linux-riscv64/Toolchain.cmake
@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR riscv64)

-set(cross_triple "riscv64-unknown-linux-gnu")
-set(cross_root /usr/xcc/${cross_triple})
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})

 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
--- a/linux-s390x/Toolchain.cmake
+++ b/linux-s390x/Toolchain.cmake
@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR s390x)

-set(cross_triple "s390x-ibm-linux-gnu")
-set(cross_root /usr/xcc/${cross_triple})
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})

 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
--- a/linux-x64-tinycc/Dockerfile.in
+++ b/linux-x64-tinycc/Dockerfile.in
@ -1,7 +1,13 @@
 FROM dockcross/base:latest
 MAINTAINER Matt McCormick "matt.mccormick@kitware.com"

-RUN git clone --recurse-submodules https://repo.or.cz/tinycc.git \
+# This image use Tinycc as C compiler and GCC as C++ compiler
+
+ARG REPO_URL=https://repo.or.cz/tinycc.git
+ENV REPO_URL=${REPO_URL}
+
+# Disable options: --with-libgcc --disable-static
+RUN git clone --recurse-submodules --remote-submodules ${REPO_URL} \
    && cd tinycc \
    && ./configure --cpu=x86_64 \
    && make -j$(nproc) \
@ -9,6 +15,7 @@ RUN git clone --recurse-submodules https://repo.or.cz/tinycc.git \
    && make install

 ENV PATH="/usr/local/bin:${PATH}"
+
 # Test if compiler work
 RUN tcc -v

@ -22,7 +29,6 @@ ENV AS=/usr/bin/${CROSS_TRIPLE}-as \
    LD=/usr/bin/${CROSS_TRIPLE}-ld \
    FC=/usr/bin/${CROSS_TRIPLE}-gfortran

-
 COPY ${CROSS_TRIPLE}-noop.sh /usr/bin/${CROSS_TRIPLE}-noop

 COPY Toolchain.cmake /usr/lib/${CROSS_TRIPLE}/
--- a/linux-x64-tinycc/Toolchain.cmake
+++ b/linux-x64-tinycc/Toolchain.cmake
@ -2,7 +2,7 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR x86_64)

-set(cross_triple "x86_64-linux-gnu")
+set(cross_triple $ENV{CROSS_TRIPLE})

 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
--- a/linux-xtensa-uclibc/Toolchain.cmake
+++ b/linux-xtensa-uclibc/Toolchain.cmake
@ -2,8 +2,8 @@ set(CMAKE_SYSTEM_NAME Linux)
 set(CMAKE_SYSTEM_VERSION 1)
 set(CMAKE_SYSTEM_PROCESSOR xtensa)

-set(cross_triple "xtensa-fsf-linux-uclibc")
-set(cross_root /usr/xcc/${cross_triple})
+set(cross_triple $ENV{CROSS_TRIPLE})
+set(cross_root $ENV{CROSS_ROOT})

 set(CMAKE_C_COMPILER $ENV{CC})
 set(CMAKE_CXX_COMPILER $ENV{CXX})
--- a/windows-arm64/Dockerfile.in
+++ b/windows-arm64/Dockerfile.in
@ -12,9 +12,8 @@ RUN mkdir -p ${CROSS_ROOT} && wget -qO- "${DOWNLOAD_URL}" | tar xJvf - --strip 1

 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
-    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \
-    CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
-    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \
+    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
+    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++ \
    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran

--- a/windows-armv7/Dockerfile.in
+++ b/windows-armv7/Dockerfile.in
@ -12,9 +12,8 @@ RUN mkdir -p ${CROSS_ROOT} && wget -qO- "${DOWNLOAD_URL}" | tar xJvf - --strip 1

 ENV AS=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-as \
    AR=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ar \
-    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang \
-    CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
-    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \
+    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
+    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++ \
    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran

--- a/windows-armv7/Toolchain.cmake
+++ b/windows-armv7/Toolchain.cmake
@ -16,4 +16,4 @@ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY BOTH)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE BOTH)

-set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-arm)
+set(CMAKE_CROSSCOMPILING_EMULATOR /usr/bin/qemu-arm)
Author	SHA1	Message	Date
Bensuperpc	c8de7138af	Update tinycc image Update tinycc image Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-12 22:37:43 +02:00
Bensuperpc	5663ada809	Use env variable instead hardcoded variable in toolchain.cmake Use env variable instead hardcoded variable in toolchain.cmake Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-12 21:38:43 +02:00
Bensuperpc	95c12a3a87	Merge pull request #559 from tresf/patch-1 Remove cpp, allow gcc -E fallback	2021-08-12 02:31:50 +02:00
tresf	713ebf0491	Remove cpp from ARMv7 too	2021-08-11 15:55:51 -04:00
Tres Finocchiaro	434877cfe1	Remove cpp, allow gcc -E fallback Also switches to using mingw-w64 "familiar" suffixes	2021-08-11 15:48:36 -04:00
Bensuperpc	428fa38a94	Merge pull request #558 from bensuperpc/Update_readme_and_makefile Update Readme and Makefile	2021-08-11 18:58:01 +02:00
Bensuperpc	a4cb929bef	Fix build Fix build Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-11 18:32:57 +02:00
Bensuperpc	84cab46099	Update Readme and Makefile Update Readme and Makefile Signed-off-by: Bensuperpc <bensuperpc@gmail.com>	2021-08-11 10:58:03 +02:00
Bensuperpc	4481ba2a8e	Merge pull request #557 from bensuperpc/add_windows_ARM64 Add windows arm64 and armv7	2021-08-11 09:57:34 +02:00