arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix IBM XL C/C++ compiler version output in test script

pull/507/head
Jeffrey Walton 2017-09-09 16:26:16 -04:00
parent 263c38d681
commit e6f19111e0
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
TestScripts/cryptest.sh
View File

@ -466,6 +466,9 @@ if [[ (-z "$HAVE_PIC") ]]; then
if [[ "$PIC_PROBLEMS" -eq "0" ]]; then if [[ "$PIC_PROBLEMS" -eq "0" ]]; then
HAVE_PIC=1 HAVE_PIC=1
OPT_PIC=-fPIC OPT_PIC=-fPIC
if [[ ("$XLC_COMPILER" -eq "1") ]]; then
OPT_PIC=-qpic
fi
fi fi
fi fi
@ -890,6 +893,8 @@ fi
if [[ ("$SUN_COMPILER" -ne "0") ]]; then if [[ ("$SUN_COMPILER" -ne "0") ]]; then
echo $("$CXX" -V 2>&1 | "$SED" 's|CC:|Compiler:|g' | head -1) | tee -a "$TEST_RESULTS" echo $("$CXX" -V 2>&1 | "$SED" 's|CC:|Compiler:|g' | head -1) | tee -a "$TEST_RESULTS"
elif [[ ("$XLC_COMPILER" -ne "0") ]]; then
echo "Compiler:" $("$CXX" -qversion | head -1) | tee -a "$TEST_RESULTS"
else else
echo "Compiler:" $("$CXX" --version | head -1) | tee -a "$TEST_RESULTS" echo "Compiler:" $("$CXX" --version | head -1) | tee -a "$TEST_RESULTS"
fi fi

5
cryptest.sh
View File

@ -466,6 +466,9 @@ if [[ (-z "$HAVE_PIC") ]]; then
if [[ "$PIC_PROBLEMS" -eq "0" ]]; then if [[ "$PIC_PROBLEMS" -eq "0" ]]; then
HAVE_PIC=1 HAVE_PIC=1
OPT_PIC=-fPIC OPT_PIC=-fPIC
if [[ ("$XLC_COMPILER" -eq "1") ]]; then
OPT_PIC=-qpic
fi
fi fi
fi fi
@ -890,6 +893,8 @@ fi
if [[ ("$SUN_COMPILER" -ne "0") ]]; then if [[ ("$SUN_COMPILER" -ne "0") ]]; then
echo $("$CXX" -V 2>&1 | "$SED" 's|CC:|Compiler:|g' | head -1) | tee -a "$TEST_RESULTS" echo $("$CXX" -V 2>&1 | "$SED" 's|CC:|Compiler:|g' | head -1) | tee -a "$TEST_RESULTS"
elif [[ ("$XLC_COMPILER" -ne "0") ]]; then
echo "Compiler:" $("$CXX" -qversion | head -1) | tee -a "$TEST_RESULTS"
else else
echo "Compiler:" $("$CXX" --version | head -1) | tee -a "$TEST_RESULTS" echo "Compiler:" $("$CXX" --version | head -1) | tee -a "$TEST_RESULTS"
fi fi