mirror of
https://github.com/rehlds/rehlds.git
synced 2025-02-26 13:31:04 +03:00
build.sh fix jobs option parsing
glibc_test.sh: reworked pattern
This commit is contained in:
parent
7bd3d73b79
commit
1d15946cff
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@ -192,7 +192,7 @@ jobs:
|
||||
echo -e "\e[30;43mExit code: $retVal\e[0m"
|
||||
fi
|
||||
shell: bash
|
||||
|
||||
|
||||
- name: Build using Intel C++ Compiler
|
||||
run: |
|
||||
rm -rf build && CC=icc CXX=icpc cmake -B build && cmake --build build -j8
|
||||
|
8
build.sh
8
build.sh
@ -9,7 +9,7 @@ for i in "$@"
|
||||
do
|
||||
case $i in
|
||||
-j=*|--jobs=*)
|
||||
jobs="${i#*=}"
|
||||
jobs="-j${i#*=}"
|
||||
shift
|
||||
;;
|
||||
-c=*|--compiler=*)
|
||||
@ -33,7 +33,7 @@ esac
|
||||
|
||||
rm -rf build
|
||||
mkdir build
|
||||
pushd build
|
||||
pushd build &> /dev/null
|
||||
CC=$CC CXX=$CXX cmake ${args[@]} ..
|
||||
make -j${jobs}
|
||||
popd
|
||||
make ${jobs}
|
||||
popd > /dev/null
|
||||
|
@ -22,7 +22,7 @@ main()
|
||||
elif [ "$version" = "PRIVATE" ]; then
|
||||
version="PRV"
|
||||
# ensure numeric
|
||||
elif [[ $version =~ ^[0-9]+$ ]]; then
|
||||
elif [[ $version =~ ^([0-9]+\.){0,2}(\*|[0-9]+)$ ]]; then
|
||||
check_version_greater $version ${threshold_version[$k]}
|
||||
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"
|
||||
|
Loading…
x
Reference in New Issue
Block a user