diff --git a/src/system/libroot/posix/string/arch/generic/memcpy.c b/src/system/libroot/posix/string/arch/generic/memcpy.c
index b197960154..5070e78bdf 100644
--- a/src/system/libroot/posix/string/arch/generic/memcpy.c
+++ b/src/system/libroot/posix/string/arch/generic/memcpy.c
@@ -6,8 +6,6 @@
 #include <sys/types.h>
 #include <string.h>
 
-/* do not build for for arches that have overridden this with an assembly version */
-#if !defined(ARCH_x86)
 
 typedef int word;
 
@@ -45,5 +43,3 @@ void *memcpy(void *dest, const void *src, size_t count)
 	return dest;
 }
 
-#endif
-
diff --git a/src/system/libroot/posix/string/arch/x86/Jamfile b/src/system/libroot/posix/string/arch/x86/Jamfile
index edd827a2d8..4190cbf535 100644
--- a/src/system/libroot/posix/string/arch/x86/Jamfile
+++ b/src/system/libroot/posix/string/arch/x86/Jamfile
@@ -7,8 +7,12 @@ for architectureObject in [ MultiArchSubDirSetup x86 x86_gcc2 ] {
 
 		UsePrivateSystemHeaders ;
 
+		SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) generic ] ;
+
 		MergeObject <$(architecture)>posix_string_arch_$(TARGET_ARCH).o :
-			arch_string.S
+			[ MultiArchIfPrimary memcpy.c memset.c :
+				arch_string.S : x86_64 ]
 			;
+
 	}
 }