diff --git a/build/jam/PackageRules b/build/jam/PackageRules
index 1df46b0f89..2826b6e313 100644
--- a/build/jam/PackageRules
+++ b/build/jam/PackageRules
@@ -103,6 +103,7 @@ rule PreprocessPackageOrRepositoryInfo target : source : architecture
 	local sedReplacements = %HAIKU_PACKAGING_ARCH%,$(architecture) ;
 	if $(secondaryArchitecture) {
 		defines += HAIKU_SECONDARY_PACKAGING_ARCH=$(secondaryArchitecture) ;
+		defines += HAIKU_SECONDARY_PACKAGING_ARCH_$(secondaryArchitecture:U) ;
 		sedReplacements
 			+= %HAIKU_SECONDARY_PACKAGING_ARCH%,$(secondaryArchitecture) ;
 		sedReplacements +=
diff --git a/src/data/package_infos/x86_64/haiku_secondary b/src/data/package_infos/x86_64/haiku_secondary
index 515e65fdeb..d485c486cf 100644
--- a/src/data/package_infos/x86_64/haiku_secondary
+++ b/src/data/package_infos/x86_64/haiku_secondary
@@ -22,7 +22,9 @@ provides {
 
 requires {
 	lib:libfreetype_%HAIKU_SECONDARY_PACKAGING_ARCH%
+#ifndef HAIKU_SECONDARY_PACKAGING_ARCH_X86_GCC2
 	lib:libgcc_s_%HAIKU_SECONDARY_PACKAGING_ARCH%
+#endif
 	lib:libicudata_%HAIKU_SECONDARY_PACKAGING_ARCH%
 	lib:libicui18n_%HAIKU_SECONDARY_PACKAGING_ARCH%
 	lib:libicuio_%HAIKU_SECONDARY_PACKAGING_ARCH%
@@ -37,7 +39,9 @@ requires {
 #endif
 	lib:libsolv_%HAIKU_SECONDARY_PACKAGING_ARCH%
 	lib:libsolvext_%HAIKU_SECONDARY_PACKAGING_ARCH%
+#ifndef HAIKU_SECONDARY_PACKAGING_ARCH_X86_GCC2
 	lib:libstdc++_%HAIKU_SECONDARY_PACKAGING_ARCH%
 	lib:libsupc++_%HAIKU_SECONDARY_PACKAGING_ARCH%
+#endif
 	lib:libz_%HAIKU_SECONDARY_PACKAGING_ARCH%
 }