Bensuperpc/dockcross
1
0
Fork 0
mirror of https://github.com/bensuperpc/dockcross.git synced 2024-12-22 16:24:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix test and add

Browse Source 
Fix test and add

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
This commit is contained in:
Bensuperpc 2021-08-26 17:57:42 +02:00
parent 3149f96644
commit e6c4a14d75
8 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/main.yml vendored
View File

@ -321,7 +321,7 @@ jobs:
run: |
git clone --depth 1 --branch OpenSSL_1_1_1k https://github.com/openssl/openssl.git
cd openssl
./../tools/dockcross-command.sh ${{ matrix.arch_name.image }} ./config ${{ matrix.arch_name.openssl_arg }}
./../tools/dockcross-command.sh ${{ matrix.arch_name.image }} ./Configure ${{ matrix.arch_name.openssl_arg }}
./../tools/dockcross-make-builder.sh ${{ matrix.arch_name.image }} -j2
- name: deploy
if: github.ref == 'refs/heads/master'

1
android-arm/Dockerfile.in
View File

@ -17,6 +17,7 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
ENV ANDROID_NDK_REVISION 23
ENV ANDROID_NDK_API 23
ENV ANDROID_NDK_HOME ${CROSS_ROOT}
RUN mkdir -p /build && \
cd /build && \

1
android-arm64/Dockerfile.in
View File

@ -21,6 +21,7 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
ENV ANDROID_NDK_REVISION 23
ENV ANDROID_NDK_API 23
ENV ANDROID_NDK_HOME ${CROSS_ROOT}
RUN mkdir -p /build && \
cd /build && \

1
android-x86/Dockerfile
View File

@ -12,6 +12,7 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
ENV ANDROID_NDK_REVISION 23
ENV ANDROID_NDK_API 23
ENV ANDROID_NDK_HOME ${CROSS_ROOT}
RUN mkdir -p /build && \
cd /build && \

1
android-x86_64/Dockerfile
View File

@ -12,6 +12,7 @@ ENV AS=${CROSS_ROOT}/bin/llvm-as \
ENV ANDROID_NDK_REVISION 23
ENV ANDROID_NDK_API 23
ENV ANDROID_NDK_HOME ${CROSS_ROOT}
RUN mkdir -p /build && \
cd /build && \

2
tools/dockcross-cmake-builder.sh
View File

@ -16,7 +16,7 @@ if (( $# >= 1 )); then
chmod +x ./dockcross-"$image"
echo "Build $build_file"
./dockcross-"$image" cmake -B "$build_file" -S . -G Ninja "$cmake_arg"
./dockcross-"$image" cmake -B "$build_file" -S . -G Ninja $cmake_arg
./dockcross-"$image" ninja -C "$build_file"
else
echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <cmake arg.>"

2
tools/dockcross-command.sh
View File

@ -15,7 +15,7 @@ if (( $# >= 2 )); then
chmod +x ./dockcross-"$image"
echo "Run command in dockcross-$image"
./dockcross-"$image" "$command"
./dockcross-"$image" $command
else
echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <command>"
exit 1

2
tools/dockcross-make-builder.sh
View File

@ -16,7 +16,7 @@ if (( $# >= 1 )); then
chmod +x ./dockcross-"$image"
echo "Build $build_file"
./dockcross-"$image" bash -c 'make CXX=${CXX} CC=${CC} AR=${AR} AS=${AS} LD=${LD} CPP=${CPP} FC=${FC} '"$make_arg"
./dockcross-"$image" bash -c 'make CXX=${CXX} CC=${CC} AR=${AR} AS=${AS} LD=${LD} CPP=${CPP} FC=${FC} ' $make_arg
else
echo "Usage: ${0##*/} <docker imag (ex: linux-x64/linux-x64-clang/linux-arm64/windows-shared-x64/windows-static-x64...)> <make arg.>"
exit 1