pkgsrc-WIP-changes archive

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

rust/Makefile: use mk/atomic64.mk instead of explicit libatomic.



Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%uninett.no@localhost>
Pushed By:	he
Date:		Sat Aug 27 12:02:20 2022 +0200
Changeset:	2a6c65f2baf4d4b77a52ac89e4f2c60eced54b4a

Modified Files:
	rust/Makefile

Log Message:
rust/Makefile: use mk/atomic64.mk instead of explicit libatomic.

However, the conditional reference to libatomic-link remains.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=2a6c65f2baf4d4b77a52ac89e4f2c60eced54b4a

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

diffstat:
 rust/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diffs:
diff --git a/rust/Makefile b/rust/Makefile
index e1d314074d..dfb243410e 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -600,12 +600,11 @@ stage0-bootstrap: install
 BUILD_DEPENDS+=	compat80>=0:../../emulators/compat80
 .endif
 
+.include "../../mk/atomic64.mk"
 # This is for when we build natively:
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || \
     !empty(MACHINE_PLATFORM:MNetBSD-*-i386)
-# LLVM needs libatomic for 64-bit atomics on powerpc and i386
-.include "../../devel/libatomic/buildlink3.mk"
-# Make those libraries available via a unique directory:
+# Make libatomic library available via a unique directory:
 DEPENDS+=	libatomic-links>=0:../../devel/libatomic-links
 .endif
 


Home | Main Index | Thread Index | Old Index