diff --git a/contrib/teamcity/build-configurations.json b/contrib/teamcity/build-configurations.json --- a/contrib/teamcity/build-configurations.json +++ b/contrib/teamcity/build-configurations.json @@ -41,11 +41,17 @@ }, "build-linux-aarch64": { "script": "builds/build-linux-aarch64.sh", - "timeout": 1800 + "timeout": 1800, + "environment": { + "QEMU_LD_PREFIX": "/usr/aarch64-linux-gnu" + } }, "build-linux-arm": { "script": "builds/build-linux-arm.sh", - "timeout": 1800 + "timeout": 1800, + "environment": { + "QEMU_LD_PREFIX": "/usr/arm-linux-gnueabihf" + } }, "build-make-generator": { "script": "builds/build-make-generator.sh", diff --git a/contrib/teamcity/build-configurations.py b/contrib/teamcity/build-configurations.py --- a/contrib/teamcity/build-configurations.py +++ b/contrib/teamcity/build-configurations.py @@ -111,7 +111,11 @@ [str(script_path)] + unknown_args, check=True, cwd=build_directory, - env={**os.environ, **environment_variables}, + env={ + **os.environ, + **environment_variables, + **build.get("environment", {}) + }, timeout=build.get("timeout", DEFAULT_TIMEOUT), ) except subprocess.TimeoutExpired as e: diff --git a/contrib/teamcity/builds/build-linux-aarch64.sh b/contrib/teamcity/builds/build-linux-aarch64.sh --- a/contrib/teamcity/builds/build-linux-aarch64.sh +++ b/contrib/teamcity/builds/build-linux-aarch64.sh @@ -34,9 +34,6 @@ ) build_with_cmake -# Let qemu know where to find the system libraries -export QEMU_LD_PREFIX=/usr/aarch64-linux-gnu - # Unit tests ninja check ninja check-secp256k1 diff --git a/contrib/teamcity/builds/build-linux-arm.sh b/contrib/teamcity/builds/build-linux-arm.sh --- a/contrib/teamcity/builds/build-linux-arm.sh +++ b/contrib/teamcity/builds/build-linux-arm.sh @@ -34,9 +34,6 @@ ) build_with_cmake -# Let qemu know where to find the system libraries -export QEMU_LD_PREFIX=/usr/arm-linux-gnueabihf - # Unit tests ninja check ninja check-secp256k1