File tree Expand file tree Collapse file tree 5 files changed +6
-40
lines changed Expand file tree Collapse file tree 5 files changed +6
-40
lines changed Original file line number Diff line number Diff line change @@ -2,11 +2,11 @@ schemaVersion: 2.0.0
2
2
3
3
commandTests :
4
4
- name : mingw c compiler
5
- command : $CC
5
+ command : x86_64-w64-mingw32-gcc
6
6
args : ["--version"]
7
7
expectedOutput : [".*x86_64-w64-mingw32-gcc.*"]
8
8
- name : mingw c++ compiler
9
- command : $CXX
9
+ command : x86_64-w64-mingw32-g++
10
10
args : ["--version"]
11
11
expectedOutput : [".*x86_64-w64-mingw32-g\\+\\+*"]
12
12
- name : powershell
@@ -18,9 +18,6 @@ fileExistenceTests:
18
18
- name : " vcpkg"
19
19
path : " /root/vcpkg"
20
20
shouldExist : true
21
- - name : " cmake toolchain"
22
- path : " /home/cmake/toolchains/x86_64-w64-mingw32.toolchain.cmake"
23
- shouldExist : true
24
21
- name : " cross root"
25
22
path : " /usr/x86_64-w64-mingw32"
26
23
shouldExist : true
Original file line number Diff line number Diff line change @@ -2,11 +2,11 @@ schemaVersion: 2.0.0
2
2
3
3
commandTests :
4
4
- name : mingw c compiler
5
- command : $CC
5
+ command : x86_64-w64-mingw32-gcc
6
6
args : ["--version"]
7
7
expectedOutput : [".*x86_64-w64-mingw32-gcc.*"]
8
8
- name : mingw c++ compiler
9
- command : $CXX
9
+ command : x86_64-w64-mingw32-cpp
10
10
args : ["--version"]
11
11
expectedOutput : [".*x86_64-w64-mingw32-cpp.*"]
12
12
- name : powershell
@@ -18,9 +18,6 @@ fileExistenceTests:
18
18
- name : " vcpkg"
19
19
path : " /root/vcpkg"
20
20
shouldExist : true
21
- - name : " cmake toolchain"
22
- path : " /home/cmake/toolchains/x86_64-w64-mingw32.toolchain.cmake"
23
- shouldExist : true
24
21
- name : " cross root"
25
22
path : " /usr/x86_64-w64-mingw32"
26
23
shouldExist : true
Original file line number Diff line number Diff line change @@ -42,20 +42,10 @@ RUN rm -rf /tmp/*
42
42
CMD source ~/.cpprc
43
43
ENTRYPOINT [ "/bin/bash" ]
44
44
45
- # # setup vcpkg env. (triplets)
46
- # # https://github.com/microsoft/vcpkg/blob/master/docs/users/mingw.md
47
- ENV VCPKG_DEFAULT_HOST_TRIPLET "x64-linux"
48
- ENV VCPKG_DEFAULT_TRIPLET "x64-mingw-dynamic"
49
- ENV CC "x86_64-w64-mingw32-gcc"
50
- ENV CXX "x86_64-w64-mingw32-g++"
51
-
52
- # TODO: better setup for cmake toolchains ?
53
- COPY ./dev/cmake/x86_64-w64-mingw32.toolchain.cmake /home/cmake/toolchains/x86_64-w64-mingw32.toolchain.cmake
54
-
55
45
# ### Building
56
46
FROM base AS builder
57
47
COPY ./dev/cpp_vcpkg_project /home/app
58
48
WORKDIR /home/app
59
49
RUN bash -c 'source ~/.cpprc \
60
- && task cross_build_mingw '
50
+ && task build_cross_mingw '
61
51
Original file line number Diff line number Diff line change @@ -20,19 +20,9 @@ RUN rm -rf /tmp/*
20
20
CMD source ~/.cpprc
21
21
ENTRYPOINT [ "/bin/bash" ]
22
22
23
- # # setup vcpkg env. (triplets)
24
- # # https://github.com/microsoft/vcpkg/blob/master/docs/users/mingw.md
25
- ENV VCPKG_DEFAULT_HOST_TRIPLET "x64-linux"
26
- ENV VCPKG_DEFAULT_TRIPLET "x64-mingw-dynamic"
27
- ENV CC "x86_64-w64-mingw32-gcc"
28
- ENV CXX "x86_64-w64-mingw32-cpp"
29
-
30
- # TODO: better setup for cmake toolchains ?
31
- COPY ./dev/cmake/x86_64-w64-mingw32.toolchain.cmake /home/cmake/toolchains/x86_64-w64-mingw32.toolchain.cmake
32
-
33
23
# ### Building
34
24
FROM base AS builder
35
25
COPY ./dev/cpp_vcpkg_project /home/app
36
26
WORKDIR /home/app
37
27
RUN bash -c 'source ~/.cpprc \
38
- && task cross_build_mingw '
28
+ && task build_cross_mingw '
Original file line number Diff line number Diff line change @@ -17,14 +17,6 @@ RUN rm -rf /tmp/*
17
17
CMD source ~/.cpprc
18
18
ENTRYPOINT [ "/bin/bash" ]
19
19
20
- # # setup vcpkg env. (triplets)
21
- # # https://github.com/microsoft/vcpkg/blob/master/docs/users/mingw.md
22
- # ENV VCPKG_DEFAULT_HOST_TRIPLET "x64-linux"
23
- # ENV VCPKG_DEFAULT_TRIPLET "x64-mingw-dynamic"
24
- # ENV CC "x86_64-w64-mingw32-gcc"
25
- # ENV CXX "x86_64-w64-mingw32-g++"
26
- # # use project_options cross-compiling to setup triplets ...
27
-
28
20
# ### Building
29
21
FROM base AS builder
30
22
COPY ./dev/cpp_vcpkg_project /home/app
You can’t perform that action at this time.
0 commit comments