commit e814c110459aabc6c5f587f9d0b596af5581cf2f
author Jesse Hellemn <hellemn@fb.com> Thu Apr 25 17:46:07 2019 -0700
committer Facebook Github Bot <facebook-github-bot@users.noreply.github.com> Thu Apr 25 17:50:14 2019 -0700
tree 7c1d31fdf3b3d7a173a27bbcc1b72d113f7a5d12
parent c5cca65351103846d777f22db3eba18470915a35

Fix env vars needed for devtoolset7 binaries

Summary: Pull Request resolved: https://github.com/pytorch/pytorch/pull/19780

Differential Revision: D15091963

Pulled By: pjh5

fbshipit-source-id: 2594395b2313d5c8a37db28965d99b0541a227e3

.circleci/config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 02d65fa..32fa56f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -673,7 +673,11 @@
         set -ex
         source /env
         if [[ "$DESIRED_DEVTOOLSET" == 'devtoolset7' ]]; then
-          /builder/upgrade_gcc_abi.sh
+          source "/builder/upgrade_gcc_abi.sh"
+
+          # Env variables are not persisted into the next step
+          echo "export PATH=$PATH" > /env
+          echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH" > /env
         else
           echo "Not upgrading gcc version"
         fi

.circleci/verbatim-sources/linux-binary-build-defaults.yml

diff --git a/.circleci/verbatim-sources/linux-binary-build-defaults.yml b/.circleci/verbatim-sources/linux-binary-build-defaults.yml
index 71545a1..132f4e6 100644
--- a/.circleci/verbatim-sources/linux-binary-build-defaults.yml
+++ b/.circleci/verbatim-sources/linux-binary-build-defaults.yml
@@ -20,7 +20,11 @@
         set -ex
         source /env
         if [[ "$DESIRED_DEVTOOLSET" == 'devtoolset7' ]]; then
-          /builder/upgrade_gcc_abi.sh
+          source "/builder/upgrade_gcc_abi.sh"
+
+          # Env variables are not persisted into the next step
+          echo "export PATH=$PATH" > /env
+          echo "export LD_LIBRARY_PATH=$LD_LIBRARY_PATH" > /env
         else
           echo "Not upgrading gcc version"
         fi