diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2012-09-11 15:39:48 +0000 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2012-09-11 15:39:48 +0000 |
| commit | 664812b3844402cc23b03c9edffaf663229e03b7 (patch) | |
| tree | 9c938b4b15ac0b927ea84a184b108b2546ea5440 | |
| parent | 527747469eeb918f05a3ffac1de6b172dec2e72a (diff) | |
| download | dh-illumos-664812b3844402cc23b03c9edffaf663229e03b7.tar.gz | |
Set LDLIBS_NATIVE for native builds
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rwxr-xr-x | dh_illumos_gate | 1 | ||||
| -rwxr-xr-x | dh_illumos_make | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 1b1be7f..4625e1f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,9 @@ dh-illumos (8) UNRELEASED; urgency=low * dh_illumos_make: option --native to use native compiler. * Set LDLIBS32 and LDLIBS64 in env.sh * Support 32-bit hosts ;-) + * Set LDLIBS_NATIVE for native builds - -- Igor Pashev <pashev.igor@gmail.com> Tue, 11 Sep 2012 01:03:33 +0000 + -- Igor Pashev <pashev.igor@gmail.com> Tue, 11 Sep 2012 15:39:29 +0000 dh-illumos (7) unstable; urgency=low diff --git a/dh_illumos_gate b/dh_illumos_gate index b6fcbdb..c604a3d 100755 --- a/dh_illumos_gate +++ b/dh_illumos_gate @@ -229,6 +229,7 @@ if (open (ENV, '>', $env)) { print ENV "export STRIP=':'\n"; print ENV "export LDLIBS32=\"-YP,\$ROOT/$libdir:\$ROOT/$usrlibdir\"\n"; print ENV "export LDLIBS64=\"-YP,\$ROOT/$libdir64:\$ROOT/$usrlibdir64\"\n"; + print ENV 'export LDLIBS_NATIVE="', ($bits == 64) ? '$LDLIBS64' : '$LDLIBS32', "\"\n"; close(ENV); } else { diff --git a/dh_illumos_make b/dh_illumos_make index d26f689..ff7896d 100755 --- a/dh_illumos_make +++ b/dh_illumos_make @@ -146,9 +146,10 @@ $env .= ' CTFMERGE=:' if $dh{'WITHOUT_CTF'}; if ($dh{'NATIVE'}) { $env .= ' i386_XARCH='; + $env .= ' LDLIBS32="$LDLIBS_NATIVE"'; } foreach (@dirs) { - complex_doit(qq!cd illumos-gate && $env /usr/bin/ksh93 bldenv.sh $opts env.sh -c "cd $_ && $dh{'MAKE'} $dh{'TARGET'}"!); + complex_doit(qq!cd illumos-gate && ksh93 bldenv.sh $opts env.sh -c "cd $_ && env $env $dh{'MAKE'} $dh{'TARGET'}"!); } =head1 SEE ALSO |