Update compile_macosx.sh

DockerfileLinux

@@ -32,7 +32,7 @@ RUN ./run_linux.sh
 #Export built files
 FROM scratch AS export-stage
 COPY --from=stage /jcef/binary_distrib.tar.gz .
-COPY --from=stage /jcef/target target
-COPY --from=stage /jcef/third_party third_party
-COPY --from=stage /jcef/buildtools buildtools
-COPY --from=stage /jcef/jcef_build jcef_build
+#COPY --from=stage /jcef/target target
+#COPY --from=stage /jcef/third_party third_party
+#COPY --from=stage /jcef/buildtools buildtools
+#COPY --from=stage /jcef/jcef_build jcef_build

compile_linux.sh

@@ -70,9 +70,13 @@ if [ -f "out/buildtools/clang-format" ]; then
 fi
 
 #Move jcef_build
-rm -rf jcef/jcef_build
-mv out/jcef_build jcef/jcef_build
+if [ -f "out/jcef_build" ]; then
+    rm -rf jcef/jcef_build
+    mv out/jcef_build jcef/jcef_build
+fi
 
 #Move target to binary_distrib
-rm -rf jcef/binary_distrib
-mv out/target jcef/binary_distrib
+if [ -f "out/target" ]; then
+    rm -rf jcef/binary_distrib
+    mv out/target jcef/binary_distrib
+fi

compile_macosx.sh

@@ -53,6 +53,9 @@ if [ ! -d "jcef_build" ]; then
 fi
 cd jcef_build
 
+# Reinstall "six" python package to fix broken builds on amd64
+pip install --ignore-installed six
+
 # MacOS: Generate amd64/arm64 Makefiles.
 if [ ${TARGETARCH} == 'amd64' ]; then
     cmake -G "Ninja" -DPROJECT_ARCH="x86_64" -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ..