Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix OpenMP Travis Build Error #114

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix OpenMP Travis Build Error #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions openmp/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ build/configure: build/getsource

build/getsource: build/gcc-branch
mkdir -p gcc-source
$(eval RET_CODE=$(shell git clone -b $(GCC_BRANCH) $(UPSTREAM) gcc-source))
$(eval RET_CODE=`bash git clone -b $(GCC_BRANCH) $(UPSTREAM) gcc-source`)
$(if $(RET_CODE)==0,,$(error Clone of Git Repository failed!))

build/gcc-branch:

#Call Shell Script that determines GCC Version and exports it as gcc_branch variable
$(eval GCC_BRANCH:=$(shell ./scripts/get_gcc_ver.sh $(CC)))
$(eval GCC_BRANCH:=`bash ./scripts/get_gcc_ver.sh $(CC)`)
$(if $(GCC_BRANCH),,$(error GCC_BRANCH variable is not set!))

.PHONY: clean
Expand Down
4 changes: 2 additions & 2 deletions openmp/scripts/get_gcc_ver.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ if [ -z $1 ] ; then
exit 1;
fi

gcc_ver=$($1 -v 2>&1 >/dev/null|grep -Po '(?<=gcc version\s)([0-9]\.[0-9])');
gcc_ver_check=$(echo $gcc_ver | cut -d '.' -f 1)
gcc_ver=$($1 -v 2>&1 >/dev/null|grep "^gcc version"|cut -d' ' -f3);
gcc_ver_check=$(echo $gcc_ver | cut -d '.' -f 1);
if [ $(( $gcc_ver_check )) -eq 5 ] ; then
gcc_branch='gcc-5-branch';
echo $gcc_branch;
Expand Down