diff --git a/lld/ELF/InputFiles.cpp b/lld/ELF/InputFiles.cpp
--- a/lld/ELF/InputFiles.cpp
+++ b/lld/ELF/InputFiles.cpp
@@ -1025,12 +1025,11 @@
       name == ".gnu.linkonce.t.__i686.get_pc_thunk.bx")
     return &InputSection::discarded;
 
-  // If we are creating a new .build-id section, strip existing .build-id
-  // sections so that the output won't have more than one .build-id.
-  // This is not usually a problem because input object files normally don't
-  // have .build-id sections, but you can create such files by
-  // "ld.{bfd,gold,lld} -r --build-id", and we want to guard against it.
-  if (name == ".note.gnu.build-id" && config->buildId != BuildIdKind::None)
+  // Strip existing .note.gnu.build-id sections so that the output won't have
+  // more than one build-id. This is not usually a problem because input object
+  // files normally don't have .build-id sections, but you can create such files
+  // by "ld.{bfd,gold,lld} -r --build-id", and we want to guard against it.
+  if (name == ".note.gnu.build-id")
     return &InputSection::discarded;
 
   // The linker merges EH (exception handling) frames and creates a
diff --git a/lld/test/ELF/relocatable-build-id.s b/lld/test/ELF/relocatable-build-id.s
--- a/lld/test/ELF/relocatable-build-id.s
+++ b/lld/test/ELF/relocatable-build-id.s
@@ -4,9 +4,17 @@
 # RUN: ld.lld --build-id=0xdeadbeef -o %t.exe %t2.o
 # RUN: llvm-objdump -s %t.exe | FileCheck %s
 
+## The default --build-id=none removes .note.gnu.build-id input sections.
+# RUN: ld.lld -o %t.none %t2.o
+# RUN: llvm-readelf -S %t.none | FileCheck %s --check-prefix=NO
+
+# CHECK: Contents of section .note.gnu.build-id:
 # CHECK-NOT: cafebabe
 # CHECK: deadbeef
 
+# NO:     Section Headers:
+# NO-NOT: .note.gnu.build-id
+
 .global _start
 _start:
   ret