reHLDS/rehlds
2
0
Fork 0
mirror of https://github.com/rehlds/rehlds.git synced 2025-02-26 21:41:06 +03:00
Code Issues Projects Releases Wiki Activity

build.sh fix jobs option parsing

Browse Source 
glibc_test.sh: reworked pattern
This commit is contained in:
s1lentq 2021-04-13 04:35:26 +07:00
parent 7bd3d73b79
commit 1d15946cff
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.sh
View File

@ -9,7 +9,7 @@ for i in "$@"
do do
case $i in case $i in
-j=*|--jobs=*) -j=*|--jobs=*)
jobs="${i#*=}" jobs="-j${i#*=}"
shift shift
;; ;;
-c=*|--compiler=*) -c=*|--compiler=*)
@ -33,7 +33,7 @@ esac
rm -rf build rm -rf build
mkdir build mkdir build
pushd build pushd build &> /dev/null
CC=$CC CXX=$CXX cmake ${args[@]} .. CC=$CC CXX=$CXX cmake ${args[@]} ..
make -j${jobs} make ${jobs}
popd popd > /dev/null

2
rehlds/version/glibc_test.sh
View File

@ -22,7 +22,7 @@ main()
elif [ "$version" = "PRIVATE" ]; then elif [ "$version" = "PRIVATE" ]; then
version="PRV" version="PRV"
# ensure numeric # ensure numeric
elif [[ $version =~ ^[0-9]+$ ]]; then elif [[ $version =~ ^([0-9]+\.){0,2}(\*|[0-9]+)$ ]]; then
check_version_greater $version ${threshold_version[$k]} check_version_greater $version ${threshold_version[$k]}
if [[ $? -eq 1 ]]; then if [[ $? -eq 1 ]]; then
echo -e "\033[0;31mAssertion failed:\033[0m Binary \033[0;32m${f}\033[0m has ${k}_\033[0;33m$version\033[0m greater than max version ${k}_\033[0;33m${threshold_version[$k]}\033[0m" echo -e "\033[0;31mAssertion failed:\033[0m Binary \033[0;32m${f}\033[0m has ${k}_\033[0;33m$version\033[0m greater than max version ${k}_\033[0;33m${threshold_version[$k]}\033[0m"