Merge pull request logrhythm#117 from kjell-hedstrom/2.3.1__BuildEnvi…

…ronment__NoNative 2.3.1 build environment no native
harper-carroll · Feb 13, 2014 · 1f35763 · 1f35763
2 parents 669eef5 + 22c2222
commit 1f35763
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/packaging/protoBuffers.spec b/packaging/protoBuffers.spec
@@ -22,7 +22,7 @@ rm -rf protobuf-%{version}
 tar -xjvf ~/rpmbuild/SOURCES/protobuf-%{version}.tar.bz2
 cd protobuf-%{version}
 chmod -R a+rX,g-w,o-w .
-export GLOBAL_CPP_FLAGS="-fPIC -m64 -O3 -march=native -flto -L/usr/local/probe/lib -L/usr/local/probe/lib64 -Wl,-rpath -Wl,/usr/local/probe/lib64 -Wl,-rpath -Wl,/usr/local/probe/lib "
+export GLOBAL_CPP_FLAGS="-fPIC -m64 -Ofast -flto -L/usr/local/probe/lib -L/usr/local/probe/lib64 -Wl,-rpath -Wl,/usr/local/probe/lib64 -Wl,-rpath -Wl,/usr/local/probe/lib "
 CPPFLAGS="$CPPFLAGS $GLOBAL_CPP_FLAGS" LDFLAGS=$GLOBAL_CPP_FLAGS ./configure --prefix=/usr/local/probe
 cd ..
 %build

diff --git a/scripts/compileThirdParty.sh b/scripts/compileThirdParty.sh
@@ -7,7 +7,7 @@ DISTDIR="$thirdPartyDir"/$DIST
 protoInstallDir="$DISTDIR"/protobuf/
 protoc="$protoInstallDir"/bin/protoc
 PROTOBUFFER_VERSION=2.5.0
-GLOBAL_CPP_FLAGS="-fPIC -L/usr/local/probe/lib -L/usr/local/probe/lib64 -Wl,-rpath -Wl,/usr/local/probe/lib64 -Wl,-rpath -Wl,/usr/local/probe/lib -Ofast -m64 -O3 -march=native -flto"
+GLOBAL_CPP_FLAGS="-fPIC -L/usr/local/probe/lib -L/usr/local/probe/lib64 -Wl,-rpath -Wl,/usr/local/probe/lib64 -Wl,-rpath -Wl,/usr/local/probe/lib -Ofast -m64 -flto"
 PATH=/usr/local/probe/bin:$PATH
 
 rm -rf "$DISTDIR"/protobuf