ld -z build failures on master

Hi

There is now a "-z" option passed to ld?

Getting build failures on master when building under Ubuntu Oneiric.

Thanks,
   Noel Grandin

----------------------------------------------------------------------------------------------
commit 34ca8dd9adb62c1154f979887a38483d73da978b
Author: Jung-uk Kim <jkim@FreeBSD.org>
Date:   Wed Aug 29 11:27:23 2012 +0200

    fdo#54015: At least FreeBSD ld requires -z origin when RPATH 
contains $ORIGIN

    Signed-off-by: Stephan Bergmann <sbergman@redhat.com>:
    * bulk replacement of "-Wl,-z,origin,-rpath,..." with
      "-Wl,-z,origin -Wl,rpath,..."
    * additional hunk for directory/c-sdk/config/FreeBSD.mk in
      moz/seamonkey-source-1.1.14.patch did not apply and has been dropped

    Change-Id: Ie60c696f041108e819ce8f799cff6f58e63a5ad7
----------------------------------------------------------------------------------------------

/usr/bin/ccache gcc -shared  -Wl,-z,defs '-Wl,-z,origin 
-Wl,-rpath,$ORIGIN' -Wl,-soname -Wl,libnssutil3.so 
-Wl,--version-script,out/nssutil.def -o out/libnssutil3.so 
out/quickder.o out/secdig.o out/derdec.o out/derenc.o out/dersubr.o 
out/dertime.o out/errstrs.o out/nssb64d.o out/nssb64e.o out/nssrwlk.o 
out/nssilock.o out/oidstring.o out/portreg.o out/secalgid.o 
out/secasn1d.o out/secasn1e.o out/secasn1u.o out/secitem.o out/secload.o 
out/secoid.o out/sectime.o out/secport.o out/templates.o out/utf8.o    
-L../../../../dist/out/lib -L../../../../dist/out/lib -lplc4 -lplds4 
-lnspr4  -lpthread  -ldl -lc
/usr/bin/ld: origin -Wl: unknown -z option
/usr/bin/ld: use the --help option for usage information
collect2: ld returned 1 exit status
make[4]: *** [out/libnssutil3.so] Error 1
make[4]: Leaving directory 
`/home/noel/libo/nss/unxlngx6/misc/build/nss-3.13.5/mozilla/security/nss/lib/util'
make[3]: *** [libs] Error 2
make[3]: Leaving directory 
`/home/noel/libo/nss/unxlngx6/misc/build/nss-3.13.5/mozilla/security/nss/lib'
make[2]: *** [libs] Error 2
make[2]: Leaving directory 
`/home/noel/libo/nss/unxlngx6/misc/build/nss-3.13.5/mozilla/security/nss'
dmake:  Error code 2, while making './unxlngx6/misc/build/so_built_nss'





Disclaimer: http://www.peralex.com/disclaimer.html