diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2012-07-13 21:54:43 +0000 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2012-07-13 21:54:43 +0000 |
| commit | 047f9f545df088829e06065f934346b1c311e8e5 (patch) | |
| tree | 141ad32f02979d9c1457a47c36aaa021a5c0d78e | |
| parent | cc1e466fbf10ed3b58218efbc89e7ccad0d65402 (diff) | |
| download | dh-illumos-047f9f545df088829e06065f934346b1c311e8e5.tar.gz | |
Do not set i386_AS_XARCH
"aw" does not support it and sets --32 option by default
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rwxr-xr-x | dh_illumos_gate | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 2d83df8..a3fcb25 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +dh-illumos (6) unstable; urgency=low + + * Do not set i386_AS_XARCH: aw does not support it and sets + --32 option by default + + -- Igor Pashev <pashev.igor@gmail.com> Fri, 13 Jul 2012 21:53:51 +0000 + dh-illumos (5) unstable; urgency=low * Use /usr/lib32 for 32-bit libraries diff --git a/dh_illumos_gate b/dh_illumos_gate index 44d13a3..fec4dc7 100755 --- a/dh_illumos_gate +++ b/dh_illumos_gate @@ -155,7 +155,7 @@ Enable GCC and GCC4 mode by defining C<__GNUC> and C<__GNUC4>. Change GCC root to F</usr>, so the default system compiler is used. -Define C<i386_XARCH='-m32'> and C<i386_AS_XARCH='-xarch=i386'> since illumos sources +Define C<i386_XARCH='-m32'> since illumos sources expect default compiler to generate 32-bit code. Set library directories to be F</usr/lib/<multi-arch>>, @@ -196,7 +196,6 @@ if (open (ENV, '>', $env)) { print ENV "export __GNUC4=''\n"; print ENV "export GCC_ROOT='/usr'\n"; print ENV "export i386_XARCH='-m32'\n"; - print ENV "export i386_AS_XARCH='-xarch=i386'\n"; print ENV "export ROOTFS_LIBDIR=\"\$ROOT/usr/lib32\"\n"; print ENV "export ROOTFS_LIBDIR64=\"\$ROOT/lib/$multiarch64\"\n"; print ENV "export ROOTLIBDIR=\"\$ROOT/usr/lib32\"\n"; |