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

Tickets/dm 1361 #2

Merged
merged 4 commits into from
Oct 13, 2014
Merged

Tickets/dm 1361 #2

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e0e63f5
Hack to see if building with C++11 fixes a crash
r-owen Oct 7, 2014
cb7e932
Build with C++11
r-owen Oct 10, 2014
af14795
fixup! Build with C++11
r-owen Oct 10, 2014
a76a01c
eupspkg.cfg.sh: activate C++11 compiler support
mjuric Oct 11, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 12 additions & 1 deletion ups/eupspkg.cfg.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,18 @@ config()

build()
{
./b2 -j $NJOBS
cxxflags=-std=c++11

detect_compiler
if [[ "$COMPILER_TYPE" == gcc ]]; then
CXX1=${CXX:-c++}
IFS='.' read -a gccversion <<< "$($CXX1 -dumpversion)"
if [[ ${gccversion[0]} -lt 4 || ${gccversion[1]} -lt 7 ]]; then
cxxflags=-std=c++0x
fi
fi

./b2 -j $NJOBS cxxflags=$cxxflags
}

install()
Expand Down