pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang wasi-*: eliminate -march and/or -mcpu CFLAGS user...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/0fe6eb77a951
branches:  trunk
changeset: 371231:0fe6eb77a951
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Fri Jan 07 15:49:53 2022 +0000

description:
wasi-*: eliminate -march and/or -mcpu CFLAGS user might have set

Random CFLAGS from mk.conf are not a good idea in a cross compile scenario.
Also reset ABI to empty string since -m32 can break some native CMake tests.

diffstat:

 lang/wasi-compiler-rt/Makefile |  6 ++++--
 lang/wasi-libc/Makefile        |  6 ++++--
 lang/wasi-libcxx/Makefile      |  6 ++++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diffs (60 lines):

diff -r 615881f5793e -r 0fe6eb77a951 lang/wasi-compiler-rt/Makefile
--- a/lang/wasi-compiler-rt/Makefile    Fri Jan 07 15:44:32 2022 +0000
+++ b/lang/wasi-compiler-rt/Makefile    Fri Jan 07 15:49:53 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/01/07 14:33:43 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2022/01/07 15:49:53 tnn Exp $
 
 .include "../../lang/llvm/version.mk"
 
@@ -62,7 +62,9 @@
 
 .include "../../mk/bsd.prefs.mk"
 
-ABI=                   32
+ABI=                   # 32
+CFLAGS=                        -O2
+CXXFLAGS=              -O2
 PKGSRC_COMPILER=       clang
 CLANGBASE=             ${PREFIX}
 BUILDLINK_DEPMETHOD.clang=     build
diff -r 615881f5793e -r 0fe6eb77a951 lang/wasi-libc/Makefile
--- a/lang/wasi-libc/Makefile   Fri Jan 07 15:44:32 2022 +0000
+++ b/lang/wasi-libc/Makefile   Fri Jan 07 15:49:53 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2022/01/07 13:32:48 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2022/01/07 15:49:53 tnn Exp $
 
 GITHUB_PROJECT=        wasi-libc
 GITHUB_TAG=    ad5133410f66b93a2381db5b542aad5e0964db96
@@ -36,7 +36,9 @@
 MAKE_FLAGS+=   INSTALL_DIR=${DESTDIR}${PREFIX}/wasi
 BUILD_TARGET=  finish
 
-ABI=                   32
+ABI=                   # 32
+CFLAGS=                        -O2
+CXXFLAGS=              -O2
 PKGSRC_COMPILER=       clang
 CLANGBASE=             ${PREFIX}
 BUILDLINK_DEPMETHOD.clang=     build
diff -r 615881f5793e -r 0fe6eb77a951 lang/wasi-libcxx/Makefile
--- a/lang/wasi-libcxx/Makefile Fri Jan 07 15:44:32 2022 +0000
+++ b/lang/wasi-libcxx/Makefile Fri Jan 07 15:49:53 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2022/01/07 14:33:43 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2022/01/07 15:49:53 tnn Exp $
 
 .include "../../lang/llvm/version.mk"
 
@@ -170,7 +170,9 @@
 .include "../../lang/llvm/buildlink3.mk"
 .include "../../lang/wasi-libc/buildlink3.mk"
 .include "../../lang/wasi-compiler-rt/buildlink3.mk"
-ABI=                   32
+ABI=                   # 32
+CFLAGS=                        -O2
+CXXFLAGS=              -O2
 PKGSRC_COMPILER=       clang
 CLANGBASE=             ${PREFIX}
 BUILDLINK_DEPMETHOD.clang=     build



Home | Main Index | Thread Index | Old Index