Skip to content

Commit 1111324

Browse files
author
MarcoFalke
committed
depends: Support for S390X targets
1 parent 989fd53 commit 1111324

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

depends/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ aarch64*
1111
powerpc*
1212
riscv32*
1313
riscv64*
14+
s390x*

depends/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ $(host_prefix)/share/config.site: check-packages
186186
check-packages: check-sources
187187

188188
clean-all: clean
189-
@rm -rf $(SOURCES_PATH) x86_64* i686* mips* arm* aarch64* powerpc* riscv32* riscv64*
189+
@rm -rf $(SOURCES_PATH) x86_64* i686* mips* arm* aarch64* powerpc* riscv32* riscv64* s390x*
190190

191191
clean:
192192
@rm -rf $(WORK_PATH) $(BASE_CACHE) $(BUILD)

depends/README.md

+7-2
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ For example:
1212

1313
make HOST=x86_64-w64-mingw32 -j4
1414

15-
**Bitcoin's configure script by default will ignore the depends output.** In
15+
**Bitcoin Core's configure script by default will ignore the depends output.** In
1616
order for it to pick up libraries, tools, and settings from the depends build,
1717
you must point it at the appropriate `--prefix` directory generated by the
1818
build. In the above example, a prefix dir named x86_64-w64-mingw32 will be
1919
created. To use it for Bitcoin:
2020

21-
./configure --prefix=`pwd`/depends/x86_64-w64-mingw32
21+
./configure --prefix=$PWD/depends/x86_64-w64-mingw32
2222

2323
Common `host-platform-triplets` for cross compilation are:
2424

@@ -32,6 +32,7 @@ Common `host-platform-triplets` for cross compilation are:
3232
- `powerpc64le-linux-gnu` for Linux POWER 64-bit (little endian)
3333
- `riscv32-linux-gnu` for Linux RISC-V 32 bit
3434
- `riscv64-linux-gnu` for Linux RISC-V 64 bit
35+
- `s390x-linux-gnu` for Linux S390X
3536
- `armv7a-linux-android` for Android ARM 32 bit
3637
- `aarch64-linux-android` for Android ARM 64 bit
3738
- `i686-linux-android` for Android x86 32 bit
@@ -74,6 +75,10 @@ For linux RISC-V 64-bit cross compilation (there are no packages for 32-bit):
7475
RISC-V known issue: gcc-7.3.0 and gcc-7.3.1 result in a broken `test_bitcoin` executable (see https://github.com/bitcoin/bitcoin/pull/13543),
7576
this is apparently fixed in gcc-8.1.0.
7677

78+
For linux S390X cross compilation:
79+
80+
sudo apt-get install g++-s390x-linux-gnu binutils-s390x-linux-gnu
81+
7782
### Dependency Options
7883
The following can be set when running make: make FOO=bar
7984

depends/packages/qt.mk

+1
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ $(package)_config_opts_aarch64_linux = -xplatform linux-aarch64-gnu-g++
131131
$(package)_config_opts_powerpc64_linux = -platform linux-g++ -xplatform bitcoin-linux-g++
132132
$(package)_config_opts_powerpc64le_linux = -platform linux-g++ -xplatform bitcoin-linux-g++
133133
$(package)_config_opts_riscv64_linux = -platform linux-g++ -xplatform bitcoin-linux-g++
134+
$(package)_config_opts_s390x_linux = -platform linux-g++ -xplatform bitcoin-linux-g++
134135

135136
$(package)_config_opts_mingw32 = -no-opengl
136137
$(package)_config_opts_mingw32 += -no-dbus

0 commit comments

Comments
 (0)