Merge pull request #12980 from davidlt/remove-custom-ld-cc7

Remove custom dynamic loader from any SLC version, expect SLC6
cms-sw · Jan 18, 2016 · 8883c03 · 8883c03
2 parents 8b63340 + df8b39d
commit 8883c03
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/FWCore/Framework/bin/BuildFile.xml b/FWCore/Framework/bin/BuildFile.xml
@@ -1,4 +1,4 @@
-<architecture name="slc[6-9]_amd64">
+<architecture name="slc6_amd64">
   <flags LDFLAGS="-Wl,-dynamic-linker,$(GLIBC_BASE)/lib64/ld.so"/>
 </architecture>
 <release name=".*_ASAN_.*">

diff --git a/FWCore/ParameterSet/bin/BuildFile.xml b/FWCore/ParameterSet/bin/BuildFile.xml
@@ -1,4 +1,4 @@
-<architecture name="slc[6-9]_amd64">
+<architecture name="slc6_amd64">
  <flags LDFLAGS="-Wl,-dynamic-linker,$(GLIBC_BASE)/lib64/ld.so"/>
 </architecture>
 <release name=".*_ASAN_.*">

diff --git a/FWCore/PluginManager/bin/BuildFile.xml b/FWCore/PluginManager/bin/BuildFile.xml
@@ -1,4 +1,4 @@
-<architecture name="slc[6-9]_amd64">
+<architecture name="slc6_amd64">
   <flags LDFLAGS="-Wl,-dynamic-linker,$(GLIBC_BASE)/lib64/ld.so"/>
 </architecture>
 <release name=".*_ASAN_.*">

diff --git a/HLTrigger/Tools/bin/BuildFile.xml b/HLTrigger/Tools/bin/BuildFile.xml
@@ -1,4 +1,4 @@
-<architecture name="slc[6-9]_amd64">
+<architecture name="slc6_amd64">
   <flags LDFLAGS="-Wl,-dynamic-linker,$(GLIBC_BASE)/lib64/ld.so"/>
 </architecture>