From 529fca700a43c3fd4630e7ab16e1fc1942601bb5 Mon Sep 17 00:00:00 2001
From: 刘学利 <liuxueli@iie.ac.cn>
Date: Fri, 4 Mar 2022 04:35:10 +0000
Subject: TSG-9724: 适配Rocky Linux8.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ci/travis.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'ci/travis.sh')

diff --git a/ci/travis.sh b/ci/travis.sh
index 24fe71f..80df870 100644
--- a/ci/travis.sh
+++ b/ci/travis.sh
@@ -33,12 +33,16 @@ env | sort
 : "${COMPILER_IS_GNUCXX:=OFF}"
 
 # Install dependency from YUM
-if [ -n "${INSTALL_DEPENDENCY_LIBRARY}" ]; then
-	yum install -y $INSTALL_DEPENDENCY_LIBRARY
+if [ -n "${INSTALL_DEPENDENCY_FRAMEWORK}" ]; then
+	yum install -y $INSTALL_DEPENDENCY_FRAMEWORK
 	source /etc/profile.d/framework.sh
 fi
 
-if [ $ASAN_OPTION ];then
+if [ -n "${INSTALL_DEPENDENCY_PLATFORM}" ]; then
+	yum install -y $INSTALL_DEPENDENCY_PLATFORM
+fi
+
+if [ $ASAN_OPTION ] && [ -f "/opt/rh/devtoolset-7/enable" ] ;then
 	source /opt/rh/devtoolset-7/enable
 fi
 
-- 
cgit v1.2.3