[pkgsrc/trunk]: pkgsrc/lang/llvm llvm: move powerpc fix from options.mk to Ma...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ac91211dfc09
branches:  trunk
changeset: 456105:ac91211dfc09
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Mon Jul 19 16:18:48 2021 +0000

description:
llvm: move powerpc fix from options.mk to Makefile

Compiler options/fixes pertaining to the host compiler should not depend on
the target selection.

diffstat:

 lang/llvm/Makefile   |  8 +++++++-
 lang/llvm/options.mk |  5 +----
 2 files changed, 8 insertions(+), 5 deletions(-)

diffs (41 lines):

diff -r 2924c43200e6 -r ac91211dfc09 lang/llvm/Makefile
--- a/lang/llvm/Makefile        Mon Jul 19 15:27:29 2021 +0000
+++ b/lang/llvm/Makefile        Mon Jul 19 16:18:48 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2021/07/19 13:55:37 jperkin Exp $
+# $NetBSD: Makefile,v 1.66 2021/07/19 16:18:48 tnn Exp $
 #
 # when updating this, please also update:
 # devel/include-what-you-use
@@ -102,6 +102,12 @@
 CXXFLAGS+=     -march=i586
 .endif
 
+.if !empty(MACHINE_ARCH:Mpowerpc*)
+# Needed to avoid "relocation truncated to fit: R_PPC_REL24"
+CFLAGS+=       -mlongcall
+CXXFLAGS+=     -mlongcall
+.endif
+
 .include "options.mk"
 
 # replacing config.guess is required even for cmake.
diff -r 2924c43200e6 -r ac91211dfc09 lang/llvm/options.mk
--- a/lang/llvm/options.mk      Mon Jul 19 15:27:29 2021 +0000
+++ b/lang/llvm/options.mk      Mon Jul 19 16:18:48 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2021/07/12 18:41:02 adam Exp $
+# $NetBSD: options.mk,v 1.10 2021/07/19 16:18:48 tnn Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.llvm
 
@@ -26,9 +26,6 @@
 PKG_SUGGESTED_OPTIONS+=        llvm-target-sparc
 .elif !empty(MACHINE_ARCH:Mpowerpc*)
 PKG_SUGGESTED_OPTIONS+=        llvm-target-powerpc
-# Needed to avoid "relocation truncated to fit: R_PPC_REL24"
-CFLAGS+=               -mlongcall
-CXXFLAGS+=             -mlongcall
 .elif !empty(MACHINE_ARCH:Mearm*)
 PKG_SUGGESTED_OPTIONS+=        llvm-target-arm
 .elif !empty(MACHINE_ARCH:M*mips*)