CVS commit: pkgsrc/lang/llvm

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Jul 19 16:18:48 UTC 2021

Modified Files:
        pkgsrc/lang/llvm: Makefile options.mk

Log Message:
llvm: move powerpc fix from options.mk to Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 pkgsrc/lang/llvm/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/llvm/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/llvm/Makefile
diff -u pkgsrc/lang/llvm/Makefile:1.65 pkgsrc/lang/llvm/Makefile:1.66
--- pkgsrc/lang/llvm/Makefile:1.65      Mon Jul 19 13:55:37 2021
+++ pkgsrc/lang/llvm/Makefile   Mon Jul 19 16:18:48 2021
@@ -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 @@ PLIST_SUBST+=      SOEXT=${SOEXT}
 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.

Index: pkgsrc/lang/llvm/options.mk
diff -u pkgsrc/lang/llvm/options.mk:1.9 pkgsrc/lang/llvm/options.mk:1.10
--- pkgsrc/lang/llvm/options.mk:1.9     Mon Jul 12 18:41:02 2021
+++ pkgsrc/lang/llvm/options.mk Mon Jul 19 16:18:48 2021
@@ -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+=               terminfo
 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*)