diff --git a/packaging/DeathKnell.spec b/packaging/DeathKnell.spec index e37c666..96df0fb 100644 --- a/packaging/DeathKnell.spec +++ b/packaging/DeathKnell.spec @@ -23,7 +23,7 @@ fi %build # SKIP_BUILD_RPATH, CMAKE_SKIP_BUILD_RPATH, cd %{name}/ -PATH=/usr/local/probe/bin:$PATH +PATH=/usr/local/gcc/bin:/usr/local/probe/bin:$PATH rm -f CMakeCache.txt cd 3rdparty unzip -u gtest-1.7.0.zip @@ -31,9 +31,13 @@ cd .. if [ "%{buildtype}" == "-DUSE_LR_DEBUG=OFF" ]; then - /usr/local/probe/bin/cmake -DVERSION:STRING=%{version}.%{buildnumber} -DCMAKE_CXX_COMPILER_ARG1:STRING=' -std=c++14 -Wall -fPIC -Ofast -m64 -Wl,-rpath -Wl,. -Wl,-rpath -Wl,/usr/local/probe/lib -Wl,-rpath -Wl,/usr/local/probe/lib64 ' -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_CXX_COMPILER=/usr/local/probe/bin/g++ + /usr/local/probe/bin/cmake -DVERSION:STRING=%{version}.%{buildnumber} \ + -DCMAKE_CXX_COMPILER_ARG1:STRING=' -std=c++14 -Wall -fPIC -Ofast -m64 -isystem/usr/local/gcc/include -isystem/usr/local/probe/include -Wl,-rpath -Wl,. -Wl,-rpath -Wl,/usr/local/probe/lib -Wl,-rpath -Wl,/usr/local/gcc/lib64 ' \ + -DCMAKE_BUILD_TYPE:STRING=Release -DBUILD_SHARED_LIBS:BOOL=ON -DCMAKE_CXX_COMPILER=/usr/local/gcc/bin/g++ elif [ "%{buildtype}" == "-DUSE_LR_DEBUG=ON" ]; then - /usr/local/probe/bin/cmake -DUSE_LR_DEBUG=ON -DVERSION:STRING=%{version}.%{buildnumber} -DCMAKE_CXX_COMPILER_ARG1:STRING=' -std=c++14 -Wall -Werror -g -gdwarf-2 -O0 -fPIC -m64 -Wl,-rpath -Wl,. -Wl,-rpath -Wl,/usr/local/probe/lib -Wl,-rpath -Wl,/usr/local/probe/lib64 ' -DCMAKE_CXX_COMPILER=/usr/local/probe/bin/g++ + /usr/local/probe/bin/cmake -DUSE_LR_DEBUG=ON -DVERSION:STRING=%{version}.%{buildnumber} \ + -DCMAKE_CXX_COMPILER_ARG1:STRING=' -std=c++14 -Wall -Werror -g -gdwarf-2 -O0 -fPIC -m64 -isystem/usr/local/gcc/include -isystem/usr/local/probe/include -Wl,-rpath -Wl,. -Wl,-rpath -Wl,/usr/local/probe/lib -Wl,-rpath -Wl,/usr/local/gcc/lib64 ' \ + -DCMAKE_CXX_COMPILER=/usr/local/gcc/bin/g++ else echo "Unknown buildtype:" "%{buildtype}" exit 1