add --disable-static option to build libtcc.so instead of libtcc.a for distros that want static libs

Henry Kroll III committed 16 years ago

Commit a4ed5871 parent 15783222 files · +33 −10Browse files

Unified · Split

2 files

Makefile +27 −10
configure +6 −0

@@ -8,6 +8,18 @@ include $(TOP)/config.mak · 7 unmodified lines
8	8	CFLAGS+=-g -Wall
9	9	CFLAGS_P=$(CFLAGS) -pg -static -DCONFIG_TCC_STATIC
10	10	LIBS_P=
	11	+LIBS=.
	12	+
	13	+# My distro wants shared libs, not static ones
	14	+LIBTCCA=libtcc.a
	15	+ifdef DISABLE_STATIC
	16	+CFLAGS+=-fPIC
	17	+LIBTCCA=
	18	+LIBTCCL=-ltcc
	19	+LIBTCCSO=libtcc.so.1
	20	+endif
	21	+LIBTCCB=$(LIBTCCA)
	22	+LIBTCCB+=$(LIBTCCSO)
11	23
12	24	ifneq ($(GCC_MAJOR),2)
13	25	CFLAGS+=-fno-strict-aliasing
@@ -117,11 +129,11 @@ ifdef CONFIG_CROSS · 103 unmodified lines
117	129	PROGS+=$(PROGS_CROSS)
118	130	endif
119	131
120		−all: $(PROGS) $(LIBTCC1) $(BCHECK_O) libtcc.a tcc-doc.html tcc.1 libtcc_test$(EXESUF)
	132	+all: $(PROGS) $(LIBTCC1) $(BCHECK_O) $(LIBTCCB) tcc-doc.html tcc.1 libtcc_test$(EXESUF)
121	133
122	134	# Host Tiny C Compiler
123		−tcc$(EXESUF): tcc.o libtcc.a
124		− $(CC) -o $@ $^ $(LIBS)
	135	+tcc$(EXESUF): tcc.o $(LIBTCCA)
	136	+ $(CC) -o $@ $^ $(LIBS) $(LIBTCCL)
125	137
126	138	# Cross Tiny C Compilers
127	139	%-tcc$(EXESUF):
@@ -163,8 +175,13 @@ $(LIBTCC_OBJ) tcc.o : %.o : %.c $(LIBTCC_INC) · 35 unmodified lines
163	175	libtcc.a: $(LIBTCC_OBJ)
164	176	$(AR) rcs $@ $^
165	177
166		−libtcc_test$(EXESUF): tests/libtcc_test.c libtcc.a
167		− $(CC) -o $@ $^ -I. $(CFLAGS) $(LIBS)
	178	+libtcc.so.1: $(LIBTCC_OBJ)
	179	+ $(CC) -shared -Wl,-soname,$@ -o $@.0 $^
	180	+ ln -sf libtcc.so.1.0 libtcc.so.1
	181	+ ln -sf libtcc.so.1.0 libtcc.so
	182	+
	183	+libtcc_test$(EXESUF): tests/libtcc_test.c $(LIBTCCA)
	184	+ $(CC) -o $@ $^ -I. $(CFLAGS) $(LIBS) $(LIBTCCL)
168	185
169	186	libtest: libtcc_test$(EXESUF) $(LIBTCC1)
170	187	./libtcc_test$(EXESUF) lib_path=.
@@ -204,7 +221,7 @@ TCC_INCLUDES = stdarg.h stddef.h stdbool.h float.h varargs.h tcclib.h · 33 unmodified lines
204	221	INSTALL=install
205	222
206	223	ifndef CONFIG_WIN32
207		−install: $(PROGS) $(LIBTCC1) $(BCHECK_O) libtcc.a tcc.1 tcc-doc.html
	224	+install: $(PROGS) $(LIBTCC1) $(BCHECK_O) $(LIBTCCB) tcc.1 tcc-doc.html
208	225	mkdir -p "$(bindir)"
209	226	$(INSTALL) -s -m755 $(PROGS) "$(bindir)"
210	227	mkdir -p "$(mandir)/man1"
@@ -219,7 +236,7 @@ ifneq ($(BCHECK_O),) · 8 unmodified lines
219	236	endif
220	237	$(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(tccdir)/include"
221	238	mkdir -p "$(libdir)"
222		− $(INSTALL) -m644 libtcc.a "$(libdir)"
	239	+ $(INSTALL) -m644 $(LIBTCCB) "$(libdir)"
223	240	mkdir -p "$(includedir)"
224	241	$(INSTALL) -m644 libtcc.h "$(includedir)"
225	242	mkdir -p "$(docdir)"
@@ -230,7 +247,7 @@ uninstall: · 4 unmodified lines
230	247	rm -fv $(foreach P,$(LIBTCC1) $(BCHECK_O),"$(tccdir)/$P")
231	248	rm -fv $(foreach P,$(TCC_INCLUDES),"$(tccdir)/include/$P")
232	249	rm -fv "$(docdir)/tcc-doc.html" "$(mandir)/man1/tcc.1"
233		− rm -fv "$(libdir)/libtcc.a" "$(includedir)/libtcc.h"
	250	+ rm -fv "$(libdir)/$(LIBTCCB)" "$(includedir)/libtcc.h"
234	251
235	252	else
236	253	install: $(PROGS) $(LIBTCC1) libtcc.a tcc-doc.html
@@ -246,7 +263,7 @@ install: $(PROGS) $(LIBTCC1) libtcc.a tcc-doc.html · 9 unmodified lines
246	263	cp -r win32/examples/. "$(tccdir)/examples"
247	264	$(INSTALL) -m644 $(addprefix include/,$(TCC_INCLUDES)) "$(tccdir)/include"
248	265	$(INSTALL) -m644 tcc-doc.html win32/tcc-win32.txt "$(tccdir)/doc"
249		− $(INSTALL) -m644 libtcc.a libtcc.h "$(tccdir)/libtcc"
	266	+ $(INSTALL) -m644 $(LIBTCCB) libtcc.h "$(tccdir)/libtcc"
250	267	endif
251	268
252	269	# documentation and man page
@@ -270,7 +287,7 @@ tar: · 17 unmodified lines
270	287	$(MAKE) -C tests $@
271	288
272	289	clean:
273		− rm -vf $(PROGS) tcc_p$(EXESUF) tcc.pod ~ .o .a .out libtcc_test$(EXESUF)
	290	+ rm -vf $(PROGS) tcc_p$(EXESUF) tcc.pod ~ .o .a .out .so *.exe libtcc_test$(EXESUF)
274	291	$(MAKE) -C tests $@
275	292
276	293	distclean: clean

configure+6−0

@@ -128,6 +128,8 @@ for opt do · 127 unmodified lines
128	128	;;
129	129	--enable-cross) build_cross="yes"
130	130	;;
	131	+ --disable-static) disable_static="yes"
	132	+ ;;
131	133	--with-libgcc) use_libgcc="yes"
132	134	;;
133	135	--with-selinux) have_selinux="yes"
@@ -230,6 +232,7 @@ echo " --source-path=PATH path of source code [$source_path]" · 96 unmodified lines
230	232	echo " --cross-prefix=PREFIX use PREFIX for compile tools [$cross_prefix]"
231	233	echo " --sysroot=PREFIX prepend PREFIX to library/include paths []"
232	234	echo " --cc=CC use C compiler CC [$cc]"
	235	+echo " --disable-static make libtcc.so instead of libtcc.a"
233	236	echo " --with-libgcc use /lib/libgcc_s.so.1 instead of libtcc1.a"
234	237	echo " --with-selinux use mmap instead of exec mem"
235	238	echo " [requires write access to /tmp]"
@@ -357,6 +360,9 @@ fi · 121 unmodified lines
357	360	if test "$build_cross" = "yes" ; then
358	361	echo "CONFIG_CROSS=yes" >> config.mak
359	362	fi
	363	+if test "$disable_static" = "yes" ; then
	364	+ echo "DISABLE_STATIC=yes" >> config.mak
	365	+fi
360	366	if test "$use_libgcc" = "yes" ; then
361	367	echo "#define CONFIG_USE_LIBGCC" >> $TMPH
362	368	echo "CONFIG_USE_LIBGCC=yes" >> config.mak

add --disable-static option to build libtcc.so instead of libtcc.a for distros that want static libs

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code