diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-09-19 18:38:37 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-19 18:38:37 (GMT) |
| commit | 70f003e1070f16594529d9fb0cc6c670c1e415e2 (patch) | |
| tree | 8f1295c935a37d4b09938e32b93292ec77226c3e /Makefile | |
| parent | fbc122eafede5e5ee921b81dd42a41382eac035b (diff) | |
| parent | 5f4e02e5173c64b5b760f35283c4b0094bb85881 (diff) | |
| download | git-70f003e1070f16594529d9fb0cc6c670c1e415e2.zip git-70f003e1070f16594529d9fb0cc6c670c1e415e2.tar.gz git-70f003e1070f16594529d9fb0cc6c670c1e415e2.tar.bz2 | |
Merge branch 'tb/crlf-tests'
* tb/crlf-tests:
MinGW: update tests to handle a native eol of crlf
Makefile: propagate NATIVE_CRLF to C
t0027: Tests for core.eol=native, eol=lf, eol=crlf
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1348,6 +1348,9 @@ ifdef NO_REGEX COMPAT_CFLAGS += -Icompat/regex COMPAT_OBJS += compat/regex/regex.o endif +ifdef NATIVE_CRLF + BASIC_CFLAGS += -DNATIVE_CRLF +endif ifdef USE_NED_ALLOCATOR COMPAT_CFLAGS += -Icompat/nedmalloc |