1.1 --- a/make/solaris/makefiles/defs.make Thu May 24 13:37:47 2012 +0200
1.2 +++ b/make/solaris/makefiles/defs.make Thu May 24 12:57:01 2012 -0700
1.3 @@ -123,25 +123,10 @@
1.4 ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1)
1.5 # Default OBJCOPY comes from the SUNWbinutils package:
1.6 DEF_OBJCOPY=/usr/sfw/bin/gobjcopy
1.7 - ifeq ($(VM_PLATFORM),solaris_amd64)
1.8 - # On Solaris AMD64/X64, gobjcopy is not happy and fails:
1.9 - #
1.10 - # usr/sfw/bin/gobjcopy --add-gnu-debuglink=<lib>.debuginfo <lib>.so
1.11 - # BFD: stKPaiop: Not enough room for program headers, try linking with -N
1.12 - # /usr/sfw/bin/gobjcopy: stKPaiop: Bad value
1.13 - # BFD: stKPaiop: Not enough room for program headers, try linking with -N
1.14 - # /usr/sfw/bin/gobjcopy: libsaproc.debuginfo: Bad value
1.15 - # BFD: stKPaiop: Not enough room for program headers, try linking with -N
1.16 - # /usr/sfw/bin/gobjcopy: stKPaiop: Bad value
1.17 - _JUNK_ := $(shell \
1.18 - echo >&2 "INFO: $(DEF_OBJCOPY) is not working on Solaris AMD64/X64")
1.19 - OBJCOPY=
1.20 - else
1.21 - OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY))
1.22 - ifneq ($(ALT_OBJCOPY),)
1.23 - _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)")
1.24 - OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
1.25 - endif
1.26 + OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY))
1.27 + ifneq ($(ALT_OBJCOPY),)
1.28 + _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)")
1.29 + OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY))
1.30 endif
1.31 else
1.32 OBJCOPY=
