Merge IB/CMSSW_12_0_X/master into IB/CMSSW_12_0_X/cc8.

cms-sw · Apr 24, 2021 · 2504458 · 2504458
2 parents 48eae90 + 23d9ce9
commit 2504458
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/professor2-ppc64-flag-change.patch b/professor2-ppc64-flag-change.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index cd2ba6d..8fe79fc 100644
+index 56bc58d..ffb41ba 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -24,7 +24,7 @@ ifndef CPPFLAGS
@@ -12,14 +12,14 @@ index cd2ba6d..8fe79fc 100644
  	ifneq ($(DEBUG),0)
  	  CXXFLAGS += -g
 diff --git a/pyext/setup.py b/pyext/setup.py
-index e93fe3f..8b9ab0e 100644
+index adf3b19..fabdbf0 100644
 --- a/pyext/setup.py
 +++ b/pyext/setup.py
 @@ -14,7 +14,7 @@ ext = Extension("professor2.core",
                  language="C++",
                  depends=glob("../include/*.h"),
                  include_dirs=[incdir, os.path.join(srcdir, "pyext", "professor2")],
--                extra_compile_args="-std=c++11 -O3 -march=native -Wno-unused-but-set-variable -Wno-sign-compare".split(),
+-                extra_compile_args="-std=c++11 -O3 -Wno-unused-but-set-variable -Wno-sign-compare".split(),
 +                extra_compile_args="-std=c++11 -O3 -mcpu=native -Wno-unused-but-set-variable -Wno-sign-compare".split(),
                  library_dirs=[libdir],
                  runtime_library_dirs=[],