diff options
| author | Carlos Martín Nieto <cmn@dwim.me> | 2013-07-31 10:43:56 -0700 |
|---|---|---|
| committer | Carlos Martín Nieto <cmn@dwim.me> | 2013-07-31 10:43:56 -0700 |
| commit | 1cd0acf67260b543c6ac15c118c68031ca713da8 (patch) | |
| tree | 65b2c785b7a6d794edf501d46c60a47a36b6484e | |
| parent | 94d12ffab70f5dd7dfb3cfe2356bbe637f5e24f9 (diff) | |
| parent | a6837b5fc9465e0f271ccd2c0bb71aae78a10a64 (diff) | |
| download | libgit2-1cd0acf67260b543c6ac15c118c68031ca713da8.tar.gz | |
Merge pull request #1748 from arthurschreiber/patch-1
Allow Makefile.embed to be used when cross-compiling
| -rw-r--r-- | Makefile.embed | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/Makefile.embed b/Makefile.embed index 76b4d3cda..2f3b057c7 100644 --- a/Makefile.embed +++ b/Makefile.embed @@ -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 -AR=ar cq -RANLIB=ranlib +AR=$(PREFIX)ar cq +RANLIB=$(PREFIX)ranlib + LIBNAME=libgit2.a -ifeq ($(PLATFORM),Msys) + +ifeq ($(MINGW),1) CC=gcc else CC=cc endif +CC:=$(PREFIX)$(CC) + 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) @@ -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 -ifeq ($(PLATFORM),Msys) +ifeq ($(MINGW),1) SRCS += $(wildcard src/win32/*.c) $(wildcard src/compat/*.c) deps/regex/regex.c INCLUDES += -Ideps/regex - DEFINES += -DWIN32 -D_WIN32_WINNT=0x0501 + DEFINES += -DWIN32 -D_WIN32_WINNT=0x0501 -D__USE_MINGW_ANSI_STDIO=1 else SRCS += $(wildcard src/unix/*.c) CFLAGS += -fPIC |