From 20c61bb7a4c99ee9a757d354bec58bdc289006cf Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Mon, 13 Aug 2018 15:58:01 -0400
Subject: [PATCH] Revert unrelated changes from previous commit.

I should have read the update script more closely as to
how it added changes for committing...
---
 build/jam/BuildSetup  |  2 +-
 build/jam/LocaleRules |  3 ++-
 configure             | 12 ++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index fba830e0b9..4806ec6a33 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -61,7 +61,7 @@ HAIKU_DEFAULT_IMAGE_NAME = haiku.image ;
 HAIKU_DEFAULT_IMAGE_DIR = $(HAIKU_OUTPUT_DIR) ;
 HAIKU_DEFAULT_VMWARE_IMAGE_NAME = haiku.vmdk ;
 HAIKU_DEFAULT_INSTALL_DIR = /Haiku ;
-HAIKU_DEFAULT_IMAGE_SIZE ?= 500 ; # 300 MB
+HAIKU_DEFAULT_IMAGE_SIZE ?= 300 ; # 300 MB
 HAIKU_DEFAULT_IMAGE_LABEL ?= Haiku ;
 
 # Haiku CD defaults
diff --git a/build/jam/LocaleRules b/build/jam/LocaleRules
index 34710b1d36..e24a38770c 100644
--- a/build/jam/LocaleRules
+++ b/build/jam/LocaleRules
@@ -73,7 +73,8 @@ rule ExtractCatalogEntries target : sources : signature : regexp
 actions ExtractCatalogEntries1
 {
 	$(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR)
-	$(CC) -E $(CCDEFS) -DB_COLLECTING_CATKEYS $(HDRS) "$(2[2-)" > "$(1)".pre | true
+	cat "$(2[2-])" \
+		| $(CC) -E $(CCDEFS) -DB_COLLECTING_CATKEYS $(HDRS) - > "$(1)".pre
 	$(2[1]) $(HAIKU_CATALOG_REGEXP) -s $(HAIKU_CATALOG_SIGNATURE) \
 		-w -o "$(1)" "$(1)".pre
 }
diff --git a/configure b/configure
index 5ef0274fa9..e32c96be65 100755
--- a/configure
+++ b/configure
@@ -927,12 +927,12 @@ else
 			# Clang's compiler intrinsics are not compatible with GCC's or even
 			# across versions of Clang, so we must collect them for use in the build.
 			mkdir -p "$outputDir/clang_headers" || exit 1
-			#clangHeadersDir=`$gcc -print-resource-dir`/include/
-			#case $targetArch in
-			#	x86*) cp $clangHeadersDir/*intrin* $clangHeadersDir/mm3* "$outputDir/clang_headers" || exit 1 ;;
-			#	ppc*) cp $clangHeadersDir/*altivec* "$outputDir/clang_headers" || exit 1 ;;
-			#	arm*) cp $clangHeadersDir/*arm* "$outputDir/clang_headers" || exit 1 ;;
-			#esac
+			clangHeadersDir=`$gcc -print-resource-dir`/include/
+			case $targetArch in
+				x86*) cp $clangHeadersDir/*intrin* $clangHeadersDir/mm3* "$outputDir/clang_headers" || exit 1 ;;
+				ppc*) cp $clangHeadersDir/*altivec* "$outputDir/clang_headers" || exit 1 ;;
+				arm*) cp $clangHeadersDir/*arm* "$outputDir/clang_headers" || exit 1 ;;
+			esac
 		elif [ -z "${crossToolsPrefix}" ]; then
 			gcc=`get_variable HAIKU_CC_$targetArch`
 		else