static link libc++ on Android

cielavenir · Apr 11, 2022 · 93b007b · 93b007b
1 parent 0c2f27a
commit 93b007b
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 49 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -56,6 +56,7 @@ jobs:
         export CMPL=cmpl_gcc_x64
         export OUTDIR=g_x64
         export FLAGS=""
+        export CFLAGS_ADDITIONAL=""
         ./build_linux.sh
     - name: Build (Linux/GCC-x86)
       if: ${{ matrix.os == 'ubuntu-20.04' && matrix.mode == 'gcc-x86' }}
@@ -69,13 +70,15 @@ jobs:
         export CMPL=cmpl_gcc_x86
         export OUTDIR=g_x86
         export FLAGS="CROSS_COMPILE=i686-linux-gnu-"
+        export CFLAGS_ADDITIONAL=""
         ./build_linux.sh
     - name: Build (Linux/Clang)
       if: ${{ matrix.os == 'ubuntu-20.04' && matrix.mode == 'clang' }}
       run: |
         export CMPL=cmpl_clang_x64
         export OUTDIR=c_x64
         export FLAGS=""
+        export CFLAGS_ADDITIONAL=""
         ./build_linux.sh
     - name: Build (Linux/android-aarch64)
       if: ${{ matrix.os == 'ubuntu-20.04' && matrix.mode == 'android-aarch64' }}
@@ -90,7 +93,8 @@ jobs:
         # it seems (on clang) -march=armv8-a+crypto must be specified on command line or __ARM_FEATURE_CRYPTO will not be enabled.
         export CMPL=cmpl_clang_arm64
         export OUTDIR=c_arm64
-        export FLAGS="CROSS_COMPILE=${TARGET}${API}- CFLAGS_ADDITIONAL=-march=armv8-a+crypto -Wno-error"
+        export FLAGS="CROSS_COMPILE=${TARGET}${API}-"
+        export CFLAGS_ADDITIONAL="-march=armv8-a+crypto -Wno-error"
         ./build_linux.sh
     - name: Build (macOS)
       if: ${{ matrix.os == 'macos-latest' }}
@@ -111,6 +115,7 @@ jobs:
         export CMPL=cmpl_gcc_x64
         export OUTDIR=g_x64
         export FLAGS="SystemDrive=1 RC=x86_64-w64-mingw32-windres CROSS_COMPILE=x86_64-w64-mingw32-"
+        export CFLAGS_ADDITIONAL=""
         ./build_win.sh
     - name: Build (Win32)
       if: ${{ matrix.os == 'ubuntu-20.04' && matrix.mode == 'win32' }}
@@ -122,6 +127,7 @@ jobs:
         export CMPL=cmpl_gcc_x86
         export OUTDIR=g_x86
         export FLAGS="SystemDrive=1 RC=i686-w64-mingw32-windres CROSS_COMPILE=i686-w64-mingw32-"
+        export CFLAGS_ADDITIONAL=""
         ./build_win.sh
     - name: Upload (Linux/GCC-x64)
       if: ${{ matrix.os == 'ubuntu-20.04' && matrix.mode == 'gcc-x64' }}

diff --git a/CPP/7zip/7zip_gcc.mak b/CPP/7zip/7zip_gcc.mak
@@ -54,6 +54,10 @@ endif
 endif
 endif
 
+ifneq ($(findstring android,$(CC)),)
+LDFLAGS_STATIC_2 = -stdlib=libc++ -static-libstdc++
+endif
+
 LDFLAGS_STATIC = -DNDEBUG $(LDFLAGS_STATIC_2)
 
 ifndef O

diff --git a/build_linux.sh b/build_linux.sh
@@ -5,53 +5,53 @@ CMPL=${CMPL:-cmpl_gcc_x64}
 OUTDIR=${OUTDIR:-g_x64}
 
 mkdir -p bin/Codecs
-make -C CPP/7zip/Bundles/Alone -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Bundles/Alone -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Bundles/Alone -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Bundles/Alone -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Bundles/Alone/b/${OUTDIR}/7za bin/
-make -C CPP/7zip/Bundles/Alone2 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Bundles/Alone2 -f ../../${CMPL}.mak ${FLAGS} DISABLE_RAR_COMPRESS=1 DISABLE_PKIMPLODE_COMPRESS=1 -j16
+make -C CPP/7zip/Bundles/Alone2 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Bundles/Alone2 -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} DISABLE_RAR_COMPRESS=1 DISABLE_PKIMPLODE_COMPRESS=1 -j16
 cp CPP/7zip/Bundles/Alone2/b/${OUTDIR}/7zz bin/
-make -C CPP/7zip/Bundles/Alone7z -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Bundles/Alone7z -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Bundles/Alone7z -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Bundles/Alone7z -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Bundles/Alone7z/b/${OUTDIR}/7zr bin/
-make -C CPP/7zip/Bundles/Format7zF -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Bundles/Format7zF -f ../../${CMPL}.mak ${FLAGS} DISABLE_RAR_COMPRESS=1 DISABLE_PKIMPLODE_COMPRESS=1 -j16
+make -C CPP/7zip/Bundles/Format7zF -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Bundles/Format7zF -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} DISABLE_RAR_COMPRESS=1 DISABLE_PKIMPLODE_COMPRESS=1 -j16
 cp CPP/7zip/Bundles/Format7zF/b/${OUTDIR}/7z.so bin/
-make -C CPP/7zip/Bundles/SFXCon -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Bundles/SFXCon -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Bundles/SFXCon -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Bundles/SFXCon -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Bundles/SFXCon/b/${OUTDIR}/7zCon.sfx bin/
-make -C CPP/7zip/UI/Client7z -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/UI/Client7z -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/UI/Client7z -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/UI/Client7z -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/UI/Client7z/b/${OUTDIR}/7zcl bin/
-make -C CPP/7zip/UI/Console -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/UI/Console -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/UI/Console -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/UI/Console -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/UI/Console/b/${OUTDIR}/7z bin/
-make -C C/Util/7z -f ../../../CPP/7zip/${CMPL}.mak mkdir && make -C C/Util/7z -f ../../../CPP/7zip/${CMPL}.mak ${FLAGS} -j16
+make -C C/Util/7z -f ../../../CPP/7zip/${CMPL}.mak mkdir && make -C C/Util/7z -f ../../../CPP/7zip/${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp C/Util/7z/b/${OUTDIR}/7zdec bin/
-make -C C/Util/Lzma -f ../../../CPP/7zip/${CMPL}.mak mkdir && make -C C/Util/Lzma -f ../../../CPP/7zip/${CMPL}.mak ${FLAGS} -j16
+make -C C/Util/Lzma -f ../../../CPP/7zip/${CMPL}.mak mkdir && make -C C/Util/Lzma -f ../../../CPP/7zip/${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp C/Util/Lzma/b/${OUTDIR}/7lzma bin/
-make -C CPP/7zip/Compress/Rar -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Rar -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Rar -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Rar -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Rar/b/${OUTDIR}/Rar.so bin/Codecs/
-make -C CPP/7zip/Compress/Zstd -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Zstd -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Zstd -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Zstd -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Zstd/b/${OUTDIR}/Zstd.so bin/Codecs/
-make -C CPP/7zip/Compress/Lz4 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Lz4 -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Lz4 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Lz4 -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Lz4/b/${OUTDIR}/Lz4.so bin/Codecs/
-make -C CPP/7zip/Compress/Lz5 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Lz5 -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Lz5 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Lz5 -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Lz5/b/${OUTDIR}/Lz5.so bin/Codecs/
-make -C CPP/7zip/Compress/Lizard -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Lizard -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Lizard -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Lizard -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Lizard/b/${OUTDIR}/Lizard.so bin/Codecs/
-make -C CPP/7zip/Compress/Brotli -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Brotli -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Brotli -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Brotli -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Brotli/b/${OUTDIR}/Brotli.so bin/Codecs/
-make -C CPP/7zip/Compress/FLzma2 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/FLzma2 -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/FLzma2 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/FLzma2 -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/FLzma2/b/${OUTDIR}/FLzma2.so bin/Codecs/
-make -C CPP/7zip/Compress/Lzham -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Lzham -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Lzham -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Lzham -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Lzham/b/${OUTDIR}/Lzham.so bin/Codecs/
-make -C CPP/7zip/Compress/PKImplode -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/PKImplode -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/PKImplode -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/PKImplode -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/PKImplode/b/${OUTDIR}/PKImplode.so bin/Codecs/
-make -C CPP/7zip/Compress/Bcm -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Bcm -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Bcm -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Bcm -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Bcm/b/${OUTDIR}/Bcm.so bin/Codecs/
-make -C CPP/7zip/Compress/Balz -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Balz -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Balz -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Balz -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Balz/b/${OUTDIR}/Balz.so bin/Codecs/
-make -C CPP/7zip/Compress/Md5 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Md5 -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Md5 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Md5 -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Md5/b/${OUTDIR}/Md5.so bin/Codecs/
-make -C CPP/7zip/Compress/Sha512 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Sha512 -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Sha512 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Sha512 -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Sha512/b/${OUTDIR}/Sha512.so bin/Codecs/
-make -C CPP/7zip/Compress/Xxh64 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Xxh64 -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Xxh64 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Xxh64 -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Xxh64/b/${OUTDIR}/Xxh64.so bin/Codecs/
-make -C CPP/7zip/Compress/Blake3 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Blake3 -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Blake3 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Blake3 -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Blake3/b/${OUTDIR}/Blake3.so bin/Codecs/
 
 make -C CPP/7zip/Bundles/Alone -f ../../${CMPL}.mak clean

diff --git a/build_win.sh b/build_win.sh
@@ -5,53 +5,53 @@ CMPL=${CMPL:-cmpl_gcc_x64}
 OUTDIR=${OUTDIR:-g_x64}
 
 mkdir -p bin/Codecs
-make -C CPP/7zip/Bundles/Alone -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Bundles/Alone -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Bundles/Alone -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Bundles/Alone -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Bundles/Alone/b/${OUTDIR}/7za.exe bin/
-make -C CPP/7zip/Bundles/Alone2 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Bundles/Alone2 -f ../../${CMPL}.mak ${FLAGS} DISABLE_RAR_COMPRESS=1 DISABLE_PKIMPLODE_COMPRESS=1 -j16
+make -C CPP/7zip/Bundles/Alone2 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Bundles/Alone2 -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} DISABLE_RAR_COMPRESS=1 DISABLE_PKIMPLODE_COMPRESS=1 -j16
 cp CPP/7zip/Bundles/Alone2/b/${OUTDIR}/7zz.exe bin/
-make -C CPP/7zip/Bundles/Alone7z -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Bundles/Alone7z -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Bundles/Alone7z -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Bundles/Alone7z -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Bundles/Alone7z/b/${OUTDIR}/7zr.exe bin/
-make -C CPP/7zip/Bundles/Format7zF -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Bundles/Format7zF -f ../../${CMPL}.mak ${FLAGS} DISABLE_RAR_COMPRESS=1 DISABLE_PKIMPLODE_COMPRESS=1 -j16
+make -C CPP/7zip/Bundles/Format7zF -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Bundles/Format7zF -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} DISABLE_RAR_COMPRESS=1 DISABLE_PKIMPLODE_COMPRESS=1 -j16
 cp CPP/7zip/Bundles/Format7zF/b/${OUTDIR}/7z.dll bin/
-make -C CPP/7zip/Bundles/SFXCon -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Bundles/SFXCon -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Bundles/SFXCon -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Bundles/SFXCon -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Bundles/SFXCon/b/${OUTDIR}/7zCon.sfx.exe bin/7zCon.sfx
-make -C CPP/7zip/UI/Client7z -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/UI/Client7z -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/UI/Client7z -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/UI/Client7z -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/UI/Client7z/b/${OUTDIR}/7zcl.exe bin/
-make -C CPP/7zip/UI/Console -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/UI/Console -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/UI/Console -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/UI/Console -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/UI/Console/b/${OUTDIR}/7z.exe bin/
-make -C C/Util/7z -f ../../../CPP/7zip/${CMPL}.mak mkdir && make -C C/Util/7z -f ../../../CPP/7zip/${CMPL}.mak ${FLAGS} -j16
+make -C C/Util/7z -f ../../../CPP/7zip/${CMPL}.mak mkdir && make -C C/Util/7z -f ../../../CPP/7zip/${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp C/Util/7z/b/${OUTDIR}/7zdec.exe bin/
-make -C C/Util/Lzma -f ../../../CPP/7zip/${CMPL}.mak mkdir && make -C C/Util/Lzma -f ../../../CPP/7zip/${CMPL}.mak ${FLAGS} -j16
+make -C C/Util/Lzma -f ../../../CPP/7zip/${CMPL}.mak mkdir && make -C C/Util/Lzma -f ../../../CPP/7zip/${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp C/Util/Lzma/b/${OUTDIR}/7lzma.exe bin/
-make -C CPP/7zip/Compress/Rar -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Rar -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Rar -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Rar -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Rar/b/${OUTDIR}/Rar.dll bin/Codecs/
-make -C CPP/7zip/Compress/Zstd -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Zstd -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Zstd -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Zstd -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Zstd/b/${OUTDIR}/Zstd.dll bin/Codecs/
-make -C CPP/7zip/Compress/Lz4 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Lz4 -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Lz4 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Lz4 -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Lz4/b/${OUTDIR}/Lz4.dll bin/Codecs/
-make -C CPP/7zip/Compress/Lz5 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Lz5 -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Lz5 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Lz5 -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Lz5/b/${OUTDIR}/Lz5.dll bin/Codecs/
-make -C CPP/7zip/Compress/Lizard -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Lizard -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Lizard -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Lizard -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Lizard/b/${OUTDIR}/Lizard.dll bin/Codecs/
-make -C CPP/7zip/Compress/Brotli -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Brotli -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Brotli -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Brotli -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Brotli/b/${OUTDIR}/Brotli.dll bin/Codecs/
-make -C CPP/7zip/Compress/FLzma2 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/FLzma2 -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/FLzma2 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/FLzma2 -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/FLzma2/b/${OUTDIR}/FLzma2.dll bin/Codecs/
-make -C CPP/7zip/Compress/Lzham -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Lzham -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Lzham -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Lzham -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Lzham/b/${OUTDIR}/Lzham.dll bin/Codecs/
-make -C CPP/7zip/Compress/PKImplode -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/PKImplode -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/PKImplode -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/PKImplode -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/PKImplode/b/${OUTDIR}/PKImplode.dll bin/Codecs/
-make -C CPP/7zip/Compress/Bcm -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Bcm -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Bcm -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Bcm -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Bcm/b/${OUTDIR}/Bcm.dll bin/Codecs/
-make -C CPP/7zip/Compress/Balz -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Balz -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Balz -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Balz -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Balz/b/${OUTDIR}/Balz.dll bin/Codecs/
-make -C CPP/7zip/Compress/Md5 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Md5 -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Md5 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Md5 -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Md5/b/${OUTDIR}/Md5.dll bin/Codecs/
-make -C CPP/7zip/Compress/Sha512 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Sha512 -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Sha512 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Sha512 -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Sha512/b/${OUTDIR}/Sha512.dll bin/Codecs/
-make -C CPP/7zip/Compress/Xxh64 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Xxh64 -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Xxh64 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Xxh64 -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Xxh64/b/${OUTDIR}/Xxh64.dll bin/Codecs/
-make -C CPP/7zip/Compress/Blake3 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Blake3 -f ../../${CMPL}.mak ${FLAGS} -j16
+make -C CPP/7zip/Compress/Blake3 -f ../../${CMPL}.mak mkdir && make -C CPP/7zip/Compress/Blake3 -f ../../${CMPL}.mak CFLAGS_ADDITIONAL="${CFLAGS_ADDITIONAL}" ${FLAGS} -j16
 cp CPP/7zip/Compress/Blake3/b/${OUTDIR}/Blake3.dll bin/Codecs/
 
 make -C CPP/7zip/Bundles/Alone -f ../../${CMPL}.mak clean