← Back to branch summary

~ubuntu-branches/ubuntu/vivid/golang/vivid

« back to all changes in this revision

Viewing changes to src/cmd/dist/unix.c

  • Committer: Package Import Robot
  • Author(s): Serge Hallyn
  • Date: 2014-11-18 15:12:26 UTC
  • mfrom: (14.2.12 vivid-proposed)
  • Revision ID: package-import@ubuntu.com-20141118151226-zug7vn93mn3dtiz3
Tags: 2:1.3.2-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - 016-armhf-elf-header.patch: Use correct ELF header for armhf binaries.
  - Support co-installability with gccgo-go tool:
    - d/rules,golang-go.install: Rename bin/go -> bin/golang-go
    - d/golang-go.{postinst,prerm}: Install/remove /usr/bin/go using
      alternatives.
  - d/copyright: Amendments for full compiliance with copyright format.
  - d/control: Demote golang-go.tools to Suggests to support Ubuntu MIR.
  - dropped patches (now upstream):
    - d/p/issue27650045_40001_50001.diff
    - d/p/issue28050043_60001_70001.diff
    - d/p/issue54790044_100001_110001.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cmd/dist/unix.c
24
24
#include <errno.h>
25
25
#include <stdarg.h>
26
26
#include <setjmp.h>
 
27
#include <signal.h>
27
28
 
28
29
// bprintf replaces the buffer with the result of the printf formatting
29
30
// and returns a pointer to the NUL-terminated buffer contents.
686
687
        gohostos = "openbsd";
687
688
#elif defined(__NetBSD__)
688
689
        gohostos = "netbsd";
 
690
#elif defined(__sun) && defined(__SVR4)
 
691
        gohostos = "solaris";
 
692
        // Even on 64-bit platform, solaris uname -m prints i86pc.
 
693
        run(&b, nil, 0, "isainfo", "-n", nil);
 
694
        if(contains(bstr(&b), "amd64"))
 
695
                gohostarch = "amd64";
 
696
        if(contains(bstr(&b), "i386"))
 
697
                gohostarch = "386";
689
698
#else
690
699
        fatal("unknown operating system");
691
700
#endif