forked from josch/mmdebstrap
only append to QEMU_LD_PREFIX if it's already set
This commit is contained in:
parent
b3536b98d0
commit
7a4cefaee2
1 changed files with 6 additions and 1 deletions
|
@ -1528,7 +1528,12 @@ sub setup {
|
||||||
} elsif ($options->{mode} eq 'fakechroot') {
|
} elsif ($options->{mode} eq 'fakechroot') {
|
||||||
# The binfmt support on the outside is used, so qemu needs to know
|
# The binfmt support on the outside is used, so qemu needs to know
|
||||||
# where it has to look for shared libraries
|
# where it has to look for shared libraries
|
||||||
|
if (defined $ENV{QEMU_LD_PREFIX}
|
||||||
|
&& $ENV{QEMU_LD_PREFIX} ne "") {
|
||||||
|
$ENV{QEMU_LD_PREFIX} = "$ENV{QEMU_LD_PREFIX}:$options->{root}";
|
||||||
|
} else {
|
||||||
$ENV{QEMU_LD_PREFIX} = $options->{root};
|
$ENV{QEMU_LD_PREFIX} = $options->{root};
|
||||||
|
}
|
||||||
# Make sure that the fakeroot and fakechroot shared libraries
|
# Make sure that the fakeroot and fakechroot shared libraries
|
||||||
# exist for the right architecture
|
# exist for the right architecture
|
||||||
open my $fh, '-|', 'dpkg-architecture', '-a', $options->{nativearch}, '-qDEB_HOST_MULTIARCH' // error "failed to fork(): $!";
|
open my $fh, '-|', 'dpkg-architecture', '-a', $options->{nativearch}, '-qDEB_HOST_MULTIARCH' // error "failed to fork(): $!";
|
||||||
|
|
Loading…
Reference in a new issue