Fix rust build some more
This commit is contained in:
		
							parent
							
								
									bd13b3b07d
								
							
						
					
					
						commit
						7bb9176330
					
				
					 1 changed files with 2 additions and 6 deletions
				
			
		| 
						 | 
					@ -30,18 +30,14 @@ ffbuild_dockerbuild() {
 | 
				
			||||||
    fi
 | 
					    fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if [[ -n "$FFBUILD_RUST_TARGET" ]]; then
 | 
					    if [[ -n "$FFBUILD_RUST_TARGET" ]]; then
 | 
				
			||||||
        if [[ $TARGET == win* ]]; then
 | 
					 | 
				
			||||||
        unset PKG_CONFIG_LIBDIR
 | 
					        unset PKG_CONFIG_LIBDIR
 | 
				
			||||||
        fi
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        myconf+=(
 | 
					        myconf+=(
 | 
				
			||||||
            --target="$FFBUILD_RUST_TARGET"
 | 
					            --target="$FFBUILD_RUST_TARGET"
 | 
				
			||||||
        )
 | 
					        )
 | 
				
			||||||
        cat <<EOF >$CARGO_HOME/config.toml
 | 
					        cat <<EOF >$CARGO_HOME/config.toml
 | 
				
			||||||
[build]
 | 
					 | 
				
			||||||
target = "$FFBUILD_RUST_TARGET"
 | 
					 | 
				
			||||||
[target.$FFBUILD_RUST_TARGET]
 | 
					[target.$FFBUILD_RUST_TARGET]
 | 
				
			||||||
linker = "${FFBUILD_CROSS_PREFIX}ld"
 | 
					linker = "${FFBUILD_CROSS_PREFIX}gcc"
 | 
				
			||||||
ar = "${FFBUILD_CROSS_PREFIX}ar"
 | 
					ar = "${FFBUILD_CROSS_PREFIX}ar"
 | 
				
			||||||
EOF
 | 
					EOF
 | 
				
			||||||
    fi
 | 
					    fi
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue