diff --git a/build/jam/MainBuildRules b/build/jam/MainBuildRules
index 800f91ade5..ac9fded5ec 100644
--- a/build/jam/MainBuildRules
+++ b/build/jam/MainBuildRules
@@ -271,11 +271,6 @@ rule CreateAsmStructOffsetsHeader header : source
 	local systemIncludesOption ;
 
 	on $(header) { # use on $(1) variable values
-		if ! $(PLATFORM) in $(SUPPORTED_PLATFORMS) {
-			Echo $(PLATFORM) is not in SUPPORTED_PLATFORMS, cannot make struct-offsets header! ;
-			return ;
-		}
-
 		# headers and defines
 		headers = $(HAIKU_CONFIG_HEADERS) $(SEARCH_SOURCE) $(SUBDIRHDRS)
 			$(HDRS) ;
diff --git a/build/jam/SystemLibraryRules b/build/jam/SystemLibraryRules
index d7d75cc7f7..0310b2a6c9 100644
--- a/build/jam/SystemLibraryRules
+++ b/build/jam/SystemLibraryRules
@@ -22,6 +22,12 @@ rule TargetLibstdc++ asPath
 	# Returns the c++-standard-library for the target.
 	# Invoking with <asPath> = true will return the full library path.
 
+	if $(TARGET_PLATFORM) = libbe_test {
+		if $(TARGET_PACKAGING_ARCH) = x86_gcc2 {
+			return stdc++.r4 ;
+		}
+	}
+
 	if $(TARGET_PLATFORM) = haiku || $(TARGET_PLATFORM) = libbe_test {
 		if $(TARGET_PACKAGING_ARCH) = x86_gcc2 {
 			# the libstdc++.so for our legacy compiler (needs to be built)