From e7e07f42b336bb7b5c488eb3bcc6397c0a2a03f4 Mon Sep 17 00:00:00 2001
From: wangzhengquan <wangzhengquan85@126.com>
Date: 星期一, 24 八月 2020 16:36:09 +0800
Subject: [PATCH] fix conflict

---
 Make.defines.solaris |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/Make.defines.solaris b/Make.defines.solaris
new file mode 100755
index 0000000..daa28de
--- /dev/null
+++ b/Make.defines.solaris
@@ -0,0 +1,20 @@
+# Common make definitions, customized for each platform
+
+# Definitions required in all program directories to compile and link
+# C programs using gcc.
+
+CC=gcc
+COMPILE.c=$(CC) $(CFLAGS) $(CPPFLAGS) -c
+LINK.c=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)
+LDFLAGS=
+LDDIR=-L$(ROOT)/lib
+LDLIBS=$(LDDIR) -lapue $(EXTRALIBS)
+CFLAGS=-std=c99 -m64 -I$(ROOT)/include -std=c++11 -Wall -DSOLARIS -D__EXTENSIONS__ $(EXTRA)
+RANLIB=echo
+AR=ar
+AWK=nawk
+LIBAPUE=$(ROOT)/lib/libapue.a
+NAMEMAX=-DNAME_MAX=_XOPEN_NAME_MAX
+
+# Common temp files to delete from each directory.
+TEMPFILES=core core.* *.o temp.* *.out

--
Gitblit v1.8.0