Skip to content

Commit 0e6e327

Browse files
mhxmhx
committed
wip: try ppc64le
1 parent 639b366 commit 0e6e327

3 files changed

Lines changed: 156 additions & 144 deletions

File tree

‎.docker/build-linux.sh‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,14 @@ esac
185185

186186
case "-$BUILD_TYPE-" in
187187
*-static-*)
188-
export LDFLAGS="${LDFLAGS} -fuse-ld=mold"
188+
case "$CROSS_ARCH" in
189+
ppc64le|s390x)
190+
CMAKE_ARGS="${CMAKE_ARGS} -DDISABLE_MOLD=1"
191+
;;
192+
*)
193+
export LDFLAGS="${LDFLAGS} -fuse-ld=mold"
194+
;;
195+
esac
189196
;;
190197
esac
191198

‎.github/workflows/build.yml‎

Lines changed: 147 additions & 142 deletions
Original file line numberDiff line numberDiff line change
@@ -109,181 +109,181 @@ jobs:
109109
strategy:
110110
matrix:
111111
include:
112-
- build_arch: amd64
113-
build_dist: ubuntu
114-
build_type: gcc-release-ninja-split
112+
### - build_arch: amd64
113+
### build_dist: ubuntu
114+
### build_type: gcc-release-ninja-split
115115

116-
- build_arch: amd64
117-
build_dist: ubuntu
118-
build_type: gcc-release-shared-ninja-split
116+
### - build_arch: amd64
117+
### build_dist: ubuntu
118+
### build_type: gcc-release-shared-ninja-split
119119

120-
- build_arch: amd64
121-
build_dist: ubuntu
122-
build_type: gcc-debug-shared-ninja-full
120+
### - build_arch: amd64
121+
### build_dist: ubuntu
122+
### build_type: gcc-debug-shared-ninja-full
123123

124-
- build_arch: amd64
125-
build_dist: ubuntu
126-
build_type: gcc-debug-shared-noperfmon-ninja-split
124+
### - build_arch: amd64
125+
### build_dist: ubuntu
126+
### build_type: gcc-debug-shared-noperfmon-ninja-split
127127

128-
- build_arch: amd64
129-
build_dist: ubuntu
130-
build_type: clang-release-shared-ninja-full
128+
### - build_arch: amd64
129+
### build_dist: ubuntu
130+
### build_type: clang-release-shared-ninja-full
131131

132-
- build_arch: amd64
133-
build_dist: ubuntu
134-
build_type: clang-reldbg-shared-asan-ninja
132+
### - build_arch: amd64
133+
### build_dist: ubuntu
134+
### build_type: clang-reldbg-shared-asan-ninja
135135

136-
- build_arch: amd64
137-
build_dist: ubuntu
138-
build_type: clang-reldbg-shared-ubsan-ninja
136+
### - build_arch: amd64
137+
### build_dist: ubuntu
138+
### build_type: clang-reldbg-shared-ubsan-ninja
139139

140-
- build_arch: amd64
141-
build_dist: ubuntu
142-
build_type: clang-debug-shared-tsan-ninja
140+
### - build_arch: amd64
141+
### build_dist: ubuntu
142+
### build_type: clang-debug-shared-tsan-ninja
143143

144-
- build_arch: amd64
145-
build_dist: ubuntu
146-
build_type: clang-debug-coverage-ninja
144+
### - build_arch: amd64
145+
### build_dist: ubuntu
146+
### build_type: clang-debug-coverage-ninja
147147

148-
- build_arch: amd64
149-
build_dist: ubuntu
150-
build_type: oldgcc-debug-shared-make-split
148+
### - build_arch: amd64
149+
### build_dist: ubuntu
150+
### build_type: oldgcc-debug-shared-make-split
151151

152-
- build_arch: amd64
153-
build_dist: ubuntu
154-
build_type: oldclang-debug-shared-make-split
152+
### - build_arch: amd64
153+
### build_dist: ubuntu
154+
### build_type: oldclang-debug-shared-make-split
155155

156-
- build_arch: amd64
157-
build_dist: ubuntu-2204
158-
build_type: gcc-release-shared-ninja-split
156+
### - build_arch: amd64
157+
### build_dist: ubuntu-2204
158+
### build_type: gcc-release-shared-ninja-split
159159

160-
- build_arch: amd64
161-
build_dist: ubuntu-2204
162-
build_type: gcc-debug-shared-ninja-full
160+
### - build_arch: amd64
161+
### build_dist: ubuntu-2204
162+
### build_type: gcc-debug-shared-ninja-full
163163

164-
- build_arch: amd64
165-
build_dist: ubuntu-2204
166-
build_type: clang-release-ninja-split
164+
### - build_arch: amd64
165+
### build_dist: ubuntu-2204
166+
### build_type: clang-release-ninja-split
167167

168-
- build_arch: amd64
169-
build_dist: fedora
170-
build_type: gcc-release-ninja-split
168+
### - build_arch: amd64
169+
### build_dist: fedora
170+
### build_type: gcc-release-ninja-split
171171

172-
- build_arch: amd64
173-
build_dist: fedora
174-
build_type: gcc-release-shared-ninja-split
172+
### - build_arch: amd64
173+
### build_dist: fedora
174+
### build_type: gcc-release-shared-ninja-split
175175

176-
- build_arch: amd64
177-
build_dist: fedora
178-
build_type: gcc-debug-shared-ninja-full
176+
### - build_arch: amd64
177+
### build_dist: fedora
178+
### build_type: gcc-debug-shared-ninja-full
179179

180-
- build_arch: amd64
181-
build_dist: fedora
182-
build_type: clang-release-shared-ninja-full
180+
### - build_arch: amd64
181+
### build_dist: fedora
182+
### build_type: clang-release-shared-ninja-full
183183

184-
- build_arch: amd64
185-
build_dist: arch
186-
build_type: gcc-release-ninja-split
184+
### - build_arch: amd64
185+
### build_dist: arch
186+
### build_type: gcc-release-ninja-split
187187

188-
- build_arch: amd64
189-
build_dist: arch
190-
build_type: gcc-release-shared-ninja-split
188+
### - build_arch: amd64
189+
### build_dist: arch
190+
### build_type: gcc-release-shared-ninja-split
191191

192-
- build_arch: amd64
193-
build_dist: arch
194-
build_type: gcc-debug-shared-ninja-full
192+
### - build_arch: amd64
193+
### build_dist: arch
194+
### build_type: gcc-debug-shared-ninja-full
195195

196-
- build_arch: amd64
197-
build_dist: arch
198-
build_type: clang-release-shared-ninja-full
196+
### - build_arch: amd64
197+
### build_dist: arch
198+
### build_type: clang-release-shared-ninja-full
199199

200-
- build_arch: amd64
201-
build_dist: debian
202-
build_type: gcc-release-make-full
200+
### - build_arch: amd64
201+
### build_dist: debian
202+
### build_type: gcc-release-make-full
203203

204-
- build_arch: amd64
205-
build_dist: debian
206-
build_type: clang-debug-shared-ninja-split
204+
### - build_arch: amd64
205+
### build_dist: debian
206+
### build_type: clang-debug-shared-ninja-split
207207

208-
- build_arch: amd64
209-
build_dist: alpine
210-
build_type: gcc-release-ninja-static
208+
### - build_arch: amd64
209+
### build_dist: alpine
210+
### build_type: gcc-release-ninja-static
211211

212-
- build_arch: amd64
213-
build_dist: alpine
214-
build_type: clang-release-ninja-static
212+
### - build_arch: amd64
213+
### build_dist: alpine
214+
### build_type: clang-release-ninja-static
215215

216-
- build_arch: amd64
217-
build_dist: alpine
218-
build_type: clang-relsize-lto-ninja-static
216+
### - build_arch: amd64
217+
### build_dist: alpine
218+
### build_type: clang-relsize-lto-ninja-static
219219

220-
- build_arch: amd64
221-
build_dist: alpine
222-
build_type: clang-relsize-libressl-lto-ninja-static
220+
### - build_arch: amd64
221+
### build_dist: alpine
222+
### build_type: clang-relsize-libressl-lto-ninja-static
223223

224-
- build_arch: amd64
225-
build_dist: alpine
226-
build_type: clang-relsize-minimal-lto-ninja-static
224+
### - build_arch: amd64
225+
### build_dist: alpine
226+
### build_type: clang-relsize-minimal-lto-ninja-static
227227

228-
- build_arch: amd64
229-
build_dist: alpine
230-
build_type: clang-relsize-minimal-libressl-lto-ninja-static
228+
### - build_arch: amd64
229+
### build_dist: alpine
230+
### build_type: clang-relsize-minimal-libressl-lto-ninja-static
231231

232-
- build_arch: amd64
233-
build_dist: alpine
234-
build_type: clang-relsize-minimal-mimalloc-lto-ninja-static
232+
### - build_arch: amd64
233+
### build_dist: alpine
234+
### build_type: clang-relsize-minimal-mimalloc-lto-ninja-static
235235

236-
- build_arch: amd64
237-
build_dist: alpine
238-
build_type: clang-relsize-minimal-mimalloc-libressl-lto-ninja-static
236+
### - build_arch: amd64
237+
### build_dist: alpine
238+
### build_type: clang-relsize-minimal-mimalloc-libressl-lto-ninja-static
239239

240-
- build_arch: amd64
241-
build_dist: alpine
242-
build_type: clang-reldbg-stacktrace-ninja-static
240+
### - build_arch: amd64
241+
### build_dist: alpine
242+
### build_type: clang-reldbg-stacktrace-ninja-static
243243

244-
- build_arch: arm64v8
245-
build_dist: ubuntu
246-
build_type: gcc-debug-shared-ninja-full
244+
### - build_arch: arm64v8
245+
### build_dist: ubuntu
246+
### build_type: gcc-debug-shared-ninja-full
247247

248-
- build_arch: arm64v8
249-
build_dist: ubuntu
250-
build_type: clang-release-shared-ninja-full
248+
### - build_arch: arm64v8
249+
### build_dist: ubuntu
250+
### build_type: clang-release-shared-ninja-full
251251

252-
- build_arch: arm64v8
253-
build_dist: fedora
254-
build_type: gcc-debug-shared-ninja-full
252+
### - build_arch: arm64v8
253+
### build_dist: fedora
254+
### build_type: gcc-debug-shared-ninja-full
255255

256-
- build_arch: arm64v8
257-
build_dist: fedora
258-
build_type: clang-release-shared-ninja-full
256+
### - build_arch: arm64v8
257+
### build_dist: fedora
258+
### build_type: clang-release-shared-ninja-full
259259

260-
- build_arch: arm64v8
261-
build_dist: alpine
262-
build_type: gcc-release-ninja-static
260+
### - build_arch: arm64v8
261+
### build_dist: alpine
262+
### build_type: gcc-release-ninja-static
263263

264-
- build_arch: arm64v8
265-
build_dist: alpine
266-
build_type: clang-release-ninja-static
264+
### - build_arch: arm64v8
265+
### build_dist: alpine
266+
### build_type: clang-release-ninja-static
267267

268-
- build_arch: arm64v8
269-
build_dist: alpine
270-
build_type: clang-relsize-lto-ninja-static
268+
### - build_arch: arm64v8
269+
### build_dist: alpine
270+
### build_type: clang-relsize-lto-ninja-static
271271

272-
- build_arch: arm64v8
273-
build_dist: alpine
274-
build_type: clang-relsize-libressl-lto-ninja-static
272+
### - build_arch: arm64v8
273+
### build_dist: alpine
274+
### build_type: clang-relsize-libressl-lto-ninja-static
275275

276-
- build_arch: arm64v8
277-
build_dist: alpine
278-
build_type: clang-relsize-minimal-lto-ninja-static
276+
### - build_arch: arm64v8
277+
### build_dist: alpine
278+
### build_type: clang-relsize-minimal-lto-ninja-static
279279

280-
- build_arch: arm64v8
281-
build_dist: alpine
282-
build_type: clang-relsize-minimal-mimalloc-lto-ninja-static
280+
### - build_arch: arm64v8
281+
### build_dist: alpine
282+
### build_type: clang-relsize-minimal-mimalloc-lto-ninja-static
283283

284-
- build_arch: arm64v8
285-
build_dist: alpine
286-
build_type: clang-reldbg-stacktrace-ninja-static
284+
### - build_arch: arm64v8
285+
### build_dist: alpine
286+
### build_type: clang-reldbg-stacktrace-ninja-static
287287

288288
# - build_arch: riscv64
289289
# build_dist: alpine
@@ -301,20 +301,25 @@ jobs:
301301
### build_dist: ubuntu
302302
### build_type: clang-debug-shared-ninja-split
303303

304-
- build_arch: amd64
305-
build_dist: alpine
306-
build_type: clang-relsize-libressl-lto-ninja-static
307-
cross_arch: aarch64
304+
### - build_arch: amd64
305+
### build_dist: alpine
306+
### build_type: clang-relsize-libressl-lto-ninja-static
307+
### cross_arch: aarch64
308308

309-
- build_arch: amd64
310-
build_dist: alpine
311-
build_type: clang-relsize-libressl-lto-ninja-static
312-
cross_arch: riscv64
309+
### - build_arch: amd64
310+
### build_dist: alpine
311+
### build_type: clang-relsize-libressl-lto-ninja-static
312+
### cross_arch: riscv64
313+
314+
### - build_arch: amd64
315+
### build_dist: alpine
316+
### build_type: clang-relsize-libressl-lto-ninja-static
317+
### cross_arch: i386
313318

314319
- build_arch: amd64
315320
build_dist: alpine
316-
build_type: clang-relsize-libressl-lto-ninja-static
317-
cross_arch: i386
321+
build_type: gcc-release-ninja-static
322+
cross_arch: ppc64le
318323

319324
uses: ./.github/workflows/docker-run-build.yml
320325
with:

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1058,7 +1058,7 @@ if(STATIC_BUILD_DO_NOT_USE OR WIN32)
10581058
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
10591059
)
10601060
else()
1061-
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^(i386|x86_64|AMD64|aarch64)$")
1061+
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^(i386|x86_64|AMD64|aarch64|ppc64le)$")
10621062
find_program(UPX_EXE upx upx.exe PATHS "c:/bin" DOC "ultimate packer for executables")
10631063
endif()
10641064

0 commit comments

Comments
 (0)