File tree 1 file changed +3
-1
lines changed 1 file changed +3
-1
lines changed Original file line number Diff line number Diff line change @@ -830,6 +830,7 @@ impl Config {
830
830
}
831
831
832
832
// If the generated project is Makefile based we should carefully transfer corresponding CARGO_MAKEFLAGS
833
+ let mut use_jobserver = false ;
833
834
if fs:: metadata ( & build. join ( "Makefile" ) ) . is_ok ( ) {
834
835
match env:: var_os ( "CARGO_MAKEFLAGS" ) {
835
836
// Only do this on non-windows and non-bsd
@@ -844,6 +845,7 @@ impl Config {
844
845
|| cfg ! ( target_os = "bitrig" )
845
846
|| cfg ! ( target_os = "dragonflybsd" ) ) =>
846
847
{
848
+ use_jobserver = true ;
847
849
cmd. env ( "MAKEFLAGS" , makeflags) ;
848
850
}
849
851
_ => { }
@@ -864,7 +866,7 @@ impl Config {
864
866
865
867
// --parallel requires CMake 3.12:
866
868
// https://cmake.org/cmake/help/latest/release/3.12.html#command-line
867
- if version >= Version :: new ( 3 , 12 ) {
869
+ if version >= Version :: new ( 3 , 12 ) && !use_jobserver {
868
870
if let Ok ( s) = env:: var ( "NUM_JOBS" ) {
869
871
// See https://cmake.org/cmake/help/v3.12/manual/cmake.1.html#build-tool-mode
870
872
cmd. arg ( "--parallel" ) . arg ( s) ;
You can’t perform that action at this time.
0 commit comments