hrev52217 adds 2 changesets to branch 'master'
old head: ef9994ee7705d5be473ba4a66ee7bbf6e354fca8
new head: 20c61bb7a4c99ee9a757d354bec58bdc289006cf
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=20c61bb7a4c9+%5Eef9994ee7705
----------------------------------------------------------------------------
5924b6e410cf: configure: Guard against using Clang < 7 for builds.
Only Clang 7+ has -fno-delete-null-pointer-checks.
20c61bb7a4c9: Revert unrelated changes from previous commit.
I should have read the update script more closely as to
how it added changes for committing...
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 15 insertions(+), 8 deletions(-)
build/jam/BuildSetup | 2 +-
build/jam/LocaleRules | 3 ++-
configure | 18 ++++++++++++------
############################################################################
Commit: 5924b6e410cf2d1561d588dfbb66362509ec680c
URL: https://git.haiku-os.org/haiku/commit/?id=5924b6e410cf
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Mon Aug 13 16:33:14 2018 UTC
configure: Guard against using Clang < 7 for builds.
Only Clang 7+ has -fno-delete-null-pointer-checks.
----------------------------------------------------------------------------
diff --git a/configure b/configure
index 7ce7bb0be7..5ef0274fa9 100755
--- a/configure
+++ b/configure
@@ -719,6 +719,12 @@ while [ $# -gt 0 ] ; do
&& [ -z `get_variable
buildCrossToolsMachine_$targetArch` ]; then
set_variable crossToolsPrefix_$targetArch llvm-
fi
+ clangVersion=`$HAIKU_clang -v 2>&1 | head -1 | cut -d "
" -f3`
+ if [ `echo $clangVersion | head -c 1` -lt 7 ]; then
+ echo "Haiku requires Clang 7 or better to
build, but you have $clangVersion."
+ echo "Please install a newer version."
+ exit 1
+ fi
targetArchs="$targetArchs $targetArch"
shift 2
;;
############################################################################
Revision: hrev52217
Commit: 20c61bb7a4c99ee9a757d354bec58bdc289006cf
URL: https://git.haiku-os.org/haiku/commit/?id=20c61bb7a4c9
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Mon Aug 13 19:58:01 2018 UTC
Revert unrelated changes from previous commit.
I should have read the update script more closely as to
how it added changes for committing...
----------------------------------------------------------------------------
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
