diff options
author | Yu Jiung <jiung.yu@samsung.com> | 2016-11-10 16:24:08 +0900 |
---|---|---|
committer | Yu Jiung <jiung.yu@samsung.com> | 2016-11-10 16:25:02 +0900 |
commit | 8166b0204b6945a4fdb89bbae0b0b7168a7cf6e8 (patch) | |
tree | 81f0750d91aa467df3ee81cf30d22a65db2e6685 /Makefile.m32 | |
parent | ccccebb78520ec3a26a18370936516b12ae5d53a (diff) | |
parent | 45e88a8337839e5fd88519bc55467053d521c9f6 (diff) | |
download | c-ares-8166b0204b6945a4fdb89bbae0b0b7168a7cf6e8.tar.gz c-ares-8166b0204b6945a4fdb89bbae0b0b7168a7cf6e8.tar.bz2 c-ares-8166b0204b6945a4fdb89bbae0b0b7168a7cf6e8.zip |
Merge branch 'tizen' into tizen_basetizen_4.0.m2_releasetizen_4.0.IoT.p1_releasesubmit/tizen_base/20170705.023439submit/tizen_base/20170703.013654submit/tizen_4.0_base/20170828.000001submit/tizen_4.0_base/20170828.000000submit/tizen_4.0_base/20170811.071500accepted/tizen/base/20170707.183634accepted/tizen/4.0/base/20170828.221324accepted/tizen/4.0/base/20170811.093019
Conflicts:
packaging/c-ares.spec
Change-Id: I1ec10e394aed3ef19ee21fefbe3aba7d7a615c74
Diffstat (limited to 'Makefile.m32')
-rw-r--r-- | Makefile.m32 | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/Makefile.m32 b/Makefile.m32 index 42149f5..c27a597 100644 --- a/Makefile.m32 +++ b/Makefile.m32 @@ -10,16 +10,16 @@ LIB = libcares.a -AR = ar -CC = gcc -LD = gcc -RANLIB = ranlib +AR = $(CROSSPREFIX)ar +CC = $(CROSSPREFIX)gcc +LD = $(CROSSPREFIX)gcc +RANLIB = $(CROSSPREFIX)ranlib #RM = rm -f CP = cp -afv -CFLAGS = -O2 -Wall -I. +CFLAGS = $(CARES_CFLAG_EXTRAS) -O2 -Wall -I. CFLAGS += -DCARES_STATICLIB -LDFLAGS = -s +LDFLAGS = $(CARES_LDFLAG_EXTRAS) -s LIBS = -lwsock32 # Makefile.inc provides the CSOURCES and HHEADERS defines @@ -74,4 +74,3 @@ distclean: clean ifeq "$(wildcard ares_build.h.dist)" "ares_build.h.dist" $(RM) ares_build.h endif - |