aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-10-02 14:11:17 -0700
committerGitHub <noreply@github.com>2017-10-02 14:11:17 -0700
commitb5a2a75bc2fe905b876fa1bd60160650b911a3f5 (patch)
tree2e56998be0161befff675d291e4a9ac62377e0fc
parent20d911a91508c16bd01272ae94a3ca239a4d984e (diff)
parent973b0e534622e010b7591efb7db65ca823ac99ef (diff)
downloadvcpkg-b5a2a75bc2fe905b876fa1bd60160650b911a3f5.tar.gz
vcpkg-b5a2a75bc2fe905b876fa1bd60160650b911a3f5.zip
Merge pull request #1900 from ShinNoNoir/patch-2
[ffmpeg] Deal with case-sensitive env vars
-rw-r--r--ports/ffmpeg/build.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/ports/ffmpeg/build.sh b/ports/ffmpeg/build.sh
index 3474a111e..eea05c959 100644
--- a/ports/ffmpeg/build.sh
+++ b/ports/ffmpeg/build.sh
@@ -1,6 +1,13 @@
#!/usr/bin/bash
set -e
export PATH=/usr/bin:$PATH
+# Export HTTP(S)_PROXY as http(s)_proxy:
+if [ "$HTTP_PROXY" ]; then
+ export http_proxy=$HTTP_PROXY
+fi
+if [ "$HTTPS_PROXY" ]; then
+ export https_proxy=$HTTPS_PROXY
+fi
pacman -Sy --noconfirm --needed diffutils make
PATH_TO_BUILD_DIR="`cygpath "$1"`"