summaryrefslogtreecommitdiffstats
path: root/coin/provisioning
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-03-21 14:26:56 +0100
committerLiang Qi <liang.qi@qt.io>2019-03-21 14:26:56 +0100
commit78afd2d4b6e76e49fcda095e130604a0bd201486 (patch)
tree2faffcc50e86e468d3e574bbe6d93a8f7854aee2 /coin/provisioning
parent323dcdb60f041644d52e07d1235d87ff4999d3a0 (diff)
parent7100c54887416c99d9f4f08b81e61f1bd03fda3c (diff)
Merge remote-tracking branch 'origin/5.12.2' into 5.12
Diffstat (limited to 'coin/provisioning')
-rwxr-xr-xcoin/provisioning/common/unix/install-breakpad.sh2
-rw-r--r--coin/provisioning/common/windows/install-breakpad.ps12
2 files changed, 2 insertions, 2 deletions
diff --git a/coin/provisioning/common/unix/install-breakpad.sh b/coin/provisioning/common/unix/install-breakpad.sh
index 669469be..b05b3510 100755
--- a/coin/provisioning/common/unix/install-breakpad.sh
+++ b/coin/provisioning/common/unix/install-breakpad.sh
@@ -75,7 +75,7 @@ breakpadHome="$HOME/breakpad"
)
-SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome/src"
+SetEnvVar "BREAKPAD_SOURCE_DIR" "$breakpadHome"
echo "breakpad = $breakpad_commit_sha" >> ~/versions.txt
echo "linux_syscall_support = $linux_syscall_support_commit_sha1" >> ~/versions.txt
diff --git a/coin/provisioning/common/windows/install-breakpad.ps1 b/coin/provisioning/common/windows/install-breakpad.ps1
index 4a9544cc..7db6d8ac 100644
--- a/coin/provisioning/common/windows/install-breakpad.ps1
+++ b/coin/provisioning/common/windows/install-breakpad.ps1
@@ -87,7 +87,7 @@ catch {
git checkout $linux_syscall_support_commit_sha1
}
-Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad\src"
+Set-EnvironmentVariable "BREAKPAD_SOURCE_DIR" "$installFolder\breakpad"
# Write HEAD commit sha to versions txt, so build can be repeated at later date
Write-Output "breakpad = $breakpad_commit_sha" >> ~/versions.txt