pkgsrc-WIP-changes archive

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

rust: move user-settable stuff till after bsd.prefs.mk is included



Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Mon May 10 11:04:37 2021 +0200
Changeset:	ff1602346158ed39ffe7033e23d8d54ec016a1b5

Modified Files:
	rust/Makefile

Log Message:
rust: move user-settable stuff till after bsd.prefs.mk is included

...so that they have a hope of actually doing what was intended.

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

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

diffstat:
 rust/Makefile | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diffs:
diff --git a/rust/Makefile b/rust/Makefile
index 78f7466434..b4eb31e476 100644
--- a/rust/Makefile
+++ b/rust/Makefile
@@ -48,24 +48,6 @@ CONFIGURE_ARGS+=		--disable-ninja
 # Include (optional) settings to cross-build rust
 .include "cross.mk"
 
-.if !empty(rust.BUILD_TARGET)
-BUILD_TARGET=	${rust.BUILD_TARGET}
-.endif
-
-.if !empty(TARGET)
-# Use "dist" build target for cross compile of bootstrap
-BUILD_TARGET?=		dist
-.else
-BUILD_TARGET?=		build
-.endif
-
-# Allow overriding MAKE_JOBS_SAFE
-# some may chose to mostly build faster,
-# and deal with any failures due to deadlocks
-.if !empty(rust.MAKE_JOBS_SAFE)
-MAKE_JOBS_SAFE=	${rust.MAKE_JOBS_SAFE}
-.endif
-
 # Getting RPATH with $ORIGIN into bootstrap may be troublesome, so
 # uncommenting the LD_LIBRARY_PATH setting may be required to run
 # the bootstrap
@@ -90,6 +72,24 @@ CHECK_SSP_SUPPORTED=	no
 
 .include "../../mk/bsd.prefs.mk"
 
+# Allow overriding MAKE_JOBS_SAFE
+# some may chose to mostly build faster,
+# and deal with any failures due to deadlocks
+.if !empty(rust.MAKE_JOBS_SAFE)
+MAKE_JOBS_SAFE=	${rust.MAKE_JOBS_SAFE}
+.endif
+
+.if !empty(rust.BUILD_TARGET)
+BUILD_TARGET=	${rust.BUILD_TARGET}
+.endif
+
+.if !empty(TARGET)
+# Use "dist" build target for cross compile of bootstrap
+BUILD_TARGET?=		dist
+.else
+BUILD_TARGET?=		build
+.endif
+
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) || \
     !empty(MACHINE_PLATFORM:MNetBSD-*-earmv7hf) || \
     !empty(TARGET:Marmv7-unknown-netbsd-eabihf)


Home | Main Index | Thread Index | Old Index