Merge pull request #559 from tresf/patch-1

Remove cpp, allow gcc -E fallback
Remove cpp from ARMv7 too
2025-06-18 17:09:25 +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 · 2021-08-11 18:58:01 +02:00 · 2021-08-11 18:32:57 +02:00
3 changed files with 11 additions and 6 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 | tcc + 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/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 \
+    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
-    CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
+    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++ \
    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \
    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 \
+    CC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gcc \
-    CPP=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-cpp \
+    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-g++ \
    CXX=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-clang++ \
    LD=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-ld \
    FC=${CROSS_ROOT}/bin/${CROSS_TRIPLE}-gfortran
Author	SHA1	Message	Date
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