diff options
Diffstat (limited to 'meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch')
| -rw-r--r-- | meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch b/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch index 78b19225d4..8f130348b0 100644 --- a/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch +++ b/meta/recipes-support/boost/boost/0001-dont-setup-compiler-flags-m32-m64.patch @@ -1,4 +1,4 @@ -From 59402e3a61d14eb7ce8c2019ea1a87ad4bd28605 Mon Sep 17 00:00:00 2001 +From 7130850d74863d1e9a0ae3e85462f1466bdf6d88 Mon Sep 17 00:00:00 2001 From: Anuj Mittal <anuj.mittal@intel.com> Date: Thu, 14 Nov 2019 10:13:53 +0800 Subject: [PATCH] dont setup compiler flags -m32/-m64 @@ -9,17 +9,18 @@ Upstream-Status: Inappropriate [OE-specific] Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> --- - tools/build/src/tools/gcc.jam | 14 -------------- - 1 file changed, 14 deletions(-) + tools/build/src/tools/gcc.jam | 16 ---------------- + 1 file changed, 16 deletions(-) diff --git a/tools/build/src/tools/gcc.jam b/tools/build/src/tools/gcc.jam -index c7e3cf3..24486e0 100644 +index ed7e39baf..90513f84a 100644 --- a/tools/build/src/tools/gcc.jam +++ b/tools/build/src/tools/gcc.jam -@@ -430,20 +430,6 @@ local rule compile-link-flags ( * ) +@@ -377,22 +377,6 @@ local rule compile-link-flags ( * ) + compile-link-flags <link>shared/<target-os>$(non-windows) : -fPIC ; } - { +-{ - # Handle address-model - compile-link-flags <target-os>aix/<address-model>32 : -maix32 ; - compile-link-flags <target-os>aix/<address-model>64 : -maix64 ; @@ -28,15 +29,13 @@ index c7e3cf3..24486e0 100644 - compile-link-flags <target-os>hpux/<address-model>64 : -mlp64 ; - - local generic-os = [ set.difference $(all-os) : aix hpux ] ; +- compile-link-flags <target-os>$(generic-os)/<architecture>s390x/<address-model>32 : -m31 ; +- compile-link-flags <target-os>$(generic-os)/<architecture>s390x/<address-model>64 : -m64 ; - local arch = power sparc x86 ; - compile-link-flags <target-os>$(generic-os)/<architecture>$(arch)/<address-model>32 : -m32 ; - compile-link-flags <target-os>$(generic-os)/<architecture>$(arch)/<address-model>64 : -m64 ; -} - --{ + { # Handle threading local rule threading-flags ( * ) - { --- -2.7.4 - |