Merge pull request #15 from john-gress/probegcc_file_ownership

Compile with /usr/local/gcc
logrhythm · Jan 11, 2018 · 2ac8bc0 · 2ac8bc0
2 parents f250832 + eb522cd
commit 2ac8bc0
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/packaging/DeathKnell.spec b/packaging/DeathKnell.spec
@@ -23,17 +23,21 @@ 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
 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