From bbdf4c27fafe00c61a5aa44c472135a12a91a4e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Fri, 18 Sep 2015 02:34:49 +0200 Subject: [PATCH] glibc: avoid linking long double math stuff on PPC and M68K --- src/system/libroot/posix/glibc/math/Jamfile | 23 ++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/src/system/libroot/posix/glibc/math/Jamfile b/src/system/libroot/posix/glibc/math/Jamfile index 70c0855fc6..4476eb1ba1 100644 --- a/src/system/libroot/posix/glibc/math/Jamfile +++ b/src/system/libroot/posix/glibc/math/Jamfile @@ -17,14 +17,23 @@ for architectureObject in [ MultiArchSubDirSetup ] { UsePrivateHeaders libroot ; - MergeObject <$(architecture)>posix_gnu_math.o : - cabs.c cabsf.c cabsl.c - carg.c cargf.c cargl.c - cimag.c cimagf.c cimagl.c - conj.c conjf.c conjl.c - creal.c crealf.c creall.c + local longDoubleObjects ; + switch $(architecture) { + case ppc : longDoubleObjects = ; + case m68k : longDoubleObjects = ; + case * : longDoubleObjects = cabsl.c cargl.c cimagl.c conjl.c creall.c k_casinhl.c ; + } - k_casinh.c k_casinhf.c k_casinhl.c + MergeObject <$(architecture)>posix_gnu_math.o : + cabs.c cabsf.c + carg.c cargf.c + cimag.c cimagf.c + conj.c conjf.c + creal.c crealf.c + + k_casinh.c k_casinhf.c + + $(longDoubleObjects) ; } }