[haiku-commits] Change in haiku[master]: build: Compare to gcc2 or not gcc2

  • From: Gerrit <review@xxxxxxxxxxxxxxxxxxx>
  • To: waddlesplash <waddlesplash@xxxxxxxxx>, haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 11 Jun 2020 01:31:02 +0000

From Alex von Gluck IV <kallisti5@xxxxxxxxxxx>:

Alex von Gluck IV has uploaded this change for review. ( 
https://review.haiku-os.org/c/haiku/+/2901 ;)


Change subject: build: Compare to gcc2 or not gcc2
......................................................................

build: Compare to gcc2 or not gcc2

* jam parses "10" < "3" as a string compare
* This should all be reworked long-term to be clang friendly

Change-Id: I27bc61ce15b728dd7d61688af7984b399ae4b57a
---
M build/jam/BuildSetup
1 file changed, 4 insertions(+), 4 deletions(-)



  git pull ssh://git.haiku-os.org:22/haiku refs/changes/01/2901/1

diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 0b3bf75..1c8344a 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -275,7 +275,7 @@
 HOST_PIC_CCFLAGS += -fPIC ;
 HOST_PIC_C++FLAGS += -fPIC ;

-if $(HOST_GCC_VERSION[1]) >= 3 {
+if $(HOST_GCC_VERSION[1]) != 2 {
        HOST_GCC_BASE_FLAGS += -fno-strict-aliasing 
-fno-delete-null-pointer-checks ;
 }

@@ -305,7 +305,7 @@
 if $(HOST_PLATFORM) != darwin {
        # fix for new changes to DSO linking policies
        HOST_LINKFLAGS += -Xlinker --no-as-needed ;
-       if $(HOST_GCC_VERSION[1]) >= 3 {
+       if $(HOST_GCC_VERSION[1]) != 2 {
                HOST_LINKFLAGS += -Wl,--copy-dt-needed-entries ;
        }
 }
@@ -381,7 +381,7 @@

 if $(HOST_PLATFORM_HAIKU_COMPATIBLE) {
        # the C++ standard and support libraries
-       if $(HOST_GCC_VERSION[1]) < 3 {
+       if $(HOST_GCC_VERSION[1]) = 2 {
                HOST_LIBSTDC++ = stdc++.r4 ;
                HOST_LIBSUPC++ = ;
        } else {
@@ -417,7 +417,7 @@
        HOST_PTHREAD_LINKFLAGS = -pthread ;

        # the C++ support library
-       if $(HOST_GCC_VERSION[1]) < 3 {
+       if $(HOST_GCC_VERSION[1]) = 2 {
                HOST_LIBSUPC++ = ;
        } else {
                HOST_LIBSUPC++ = supc++ ;

--
To view, visit https://review.haiku-os.org/c/haiku/+/2901
To unsubscribe, or for help writing mail filters, visit 
https://review.haiku-os.org/settings

Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: I27bc61ce15b728dd7d61688af7984b399ae4b57a
Gerrit-Change-Number: 2901
Gerrit-PatchSet: 1
Gerrit-Owner: Alex von Gluck IV <kallisti5@xxxxxxxxxxx>
Gerrit-MessageType: newchange

Other related posts:

  • » [haiku-commits] Change in haiku[master]: build: Compare to gcc2 or not gcc2 - Gerrit