diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-06-13 12:48:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-13 12:48:34 -0700 |
| commit | 436f66b7e908d5ce2f292d1fd4e7f6f9de7c6fa1 (patch) | |
| tree | 332d2360bb3dc9299ad734bb22cc6fbb3bbf2ace /builtin-merge-ours.c | |
| parent | Merge branch 'cb/match_refs_internal_tail' (diff) | |
| parent | configure: test whether -lresolv is needed (diff) | |
| download | tgif-436f66b7e908d5ce2f292d1fd4e7f6f9de7c6fa1.tar.xz | |
Merge branch 'bc/solaris'
* bc/solaris:
configure: test whether -lresolv is needed
Makefile: insert SANE_TOOL_PATH to PATH before /bin or /usr/bin
git-compat-util.h: avoid using c99 flex array feature with Sun compiler 5.8
Makefile: add section for SunOS 5.7
Makefile: introduce SANE_TOOL_PATH for prepending required elements to PATH
Makefile: define __sun__ on SunOS
git-compat-util.h: tweak the way _XOPEN_SOURCE is set on Solaris
On Solaris choose the OLD_ICONV iconv() declaration based on the UNIX spec
Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile arguments
Makefile: use /usr/ucb/install on SunOS platforms rather than ginstall
Conflicts:
Makefile
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions