mirror of
https://git.proxmox.com/git/libgit2
synced 2025-05-08 07:58:22 +00:00
Merge pull request #1748 from arthurschreiber/patch-1
Allow Makefile.embed to be used when cross-compiling
This commit is contained in:
commit
1cd0acf672
@ -1,15 +1,33 @@
|
|||||||
PLATFORM=$(shell uname -o)
|
PLATFORM=$(shell uname -s)
|
||||||
|
|
||||||
|
ifneq (,$(CROSS_COMPILE))
|
||||||
|
PREFIX=$(CROSS_COMPILE)-
|
||||||
|
else
|
||||||
|
PREFIX=
|
||||||
|
endif
|
||||||
|
|
||||||
|
MINGW=0
|
||||||
|
ifneq (,$(findstring MINGW32,$(PLATFORM)))
|
||||||
|
MINGW=1
|
||||||
|
endif
|
||||||
|
ifneq (,$(findstring mingw,$(CROSS_COMPILE)))
|
||||||
|
MINGW=1
|
||||||
|
endif
|
||||||
|
|
||||||
rm=rm -f
|
rm=rm -f
|
||||||
AR=ar cq
|
AR=$(PREFIX)ar cq
|
||||||
RANLIB=ranlib
|
RANLIB=$(PREFIX)ranlib
|
||||||
|
|
||||||
LIBNAME=libgit2.a
|
LIBNAME=libgit2.a
|
||||||
ifeq ($(PLATFORM),Msys)
|
|
||||||
|
ifeq ($(MINGW),1)
|
||||||
CC=gcc
|
CC=gcc
|
||||||
else
|
else
|
||||||
CC=cc
|
CC=cc
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
CC:=$(PREFIX)$(CC)
|
||||||
|
|
||||||
INCLUDES= -I. -Isrc -Iinclude -Ideps/http-parser -Ideps/zlib
|
INCLUDES= -I. -Isrc -Iinclude -Ideps/http-parser -Ideps/zlib
|
||||||
|
|
||||||
DEFINES= $(INCLUDES) -DNO_VIZ -DSTDC -DNO_GZIP -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $(EXTRA_DEFINES)
|
DEFINES= $(INCLUDES) -DNO_VIZ -DSTDC -DNO_GZIP -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE $(EXTRA_DEFINES)
|
||||||
@ -17,10 +35,10 @@ CFLAGS= -g $(DEFINES) -Wall -Wextra -O2 $(EXTRA_CFLAGS)
|
|||||||
|
|
||||||
SRCS = $(wildcard src/*.c) $(wildcard src/transports/*.c) $(wildcard src/xdiff/*.c) $(wildcard deps/http-parser/*.c) $(wildcard deps/zlib/*.c) src/hash/hash_generic.c
|
SRCS = $(wildcard src/*.c) $(wildcard src/transports/*.c) $(wildcard src/xdiff/*.c) $(wildcard deps/http-parser/*.c) $(wildcard deps/zlib/*.c) src/hash/hash_generic.c
|
||||||
|
|
||||||
ifeq ($(PLATFORM),Msys)
|
ifeq ($(MINGW),1)
|
||||||
SRCS += $(wildcard src/win32/*.c) $(wildcard src/compat/*.c) deps/regex/regex.c
|
SRCS += $(wildcard src/win32/*.c) $(wildcard src/compat/*.c) deps/regex/regex.c
|
||||||
INCLUDES += -Ideps/regex
|
INCLUDES += -Ideps/regex
|
||||||
DEFINES += -DWIN32 -D_WIN32_WINNT=0x0501
|
DEFINES += -DWIN32 -D_WIN32_WINNT=0x0501 -D__USE_MINGW_ANSI_STDIO=1
|
||||||
else
|
else
|
||||||
SRCS += $(wildcard src/unix/*.c)
|
SRCS += $(wildcard src/unix/*.c)
|
||||||
CFLAGS += -fPIC
|
CFLAGS += -fPIC
|
||||||
|
Loading…
Reference in New Issue
Block a user