Fix env vars needed for devtoolset7 binaries

Summary: Pull Request resolved: pytorch#19780 Differential Revision: D15091963 Pulled By: pjh5 fbshipit-source-id: 2594395b2313d5c8a37db28965d99b0541a227e3
lcy-seso · Apr 26, 2019 · e814c11 · e814c11
1 parent c5cca65
commit e814c11
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -673,7 +673,11 @@ binary_linux_build: &binary_linux_build
         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

diff --git a/.circleci/verbatim-sources/linux-binary-build-defaults.yml b/.circleci/verbatim-sources/linux-binary-build-defaults.yml
@@ -20,7 +20,11 @@ binary_linux_build: &binary_linux_build
         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