Skip to content

Commit c652fd3

Browse files
committed
make a separate STLIB for darwintracelib1.0
1 parent 7e5c378 commit c652fd3

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

src/darwintrace_share/Makefile.in

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,27 @@ SRCS = \
1212
darwintrace_share.c
1313

1414
OBJS = $(SRCS:%.c=%.o)
15+
OBJS_FOR_DARWINTRACE = $(SRCS:%.c=%_for_darwintrace.o)
1516

1617

1718
%.d : %.c
1819
$(CC) -MM -MP $(CPPFLAGS) $< > $@
1920

2021
STLIB = darwintrace_share.a
22+
STLIB_FOR_DARWINTRACE = darwintrace_share_for_darwintrace.a
2123

2224
$(STLIB): $(OBJS)
2325
$(STLIB_LD) $@ $(OBJS)
2426

25-
all:: $(STLIB)
27+
CFLAGS_FOR_DARWINTRACE = $(CFLAGS) $(CPPFLAGS) $(UNIVERSAL_ARCHFLAGS)
28+
29+
%_for_darwintrace.o: %.c
30+
$(CC) $(CFLAGS_FOR_DARWINTRACE) -c $< -o $@
31+
32+
$(STLIB_FOR_DARWINTRACE): $(OBJS_FOR_DARWINTRACE)
33+
$(STLIB_LD) $@ $(OBJS_FOR_DARWINTRACE)
34+
35+
all:: $(STLIB) $(STLIB_FOR_DARWINTRACE)
2636

2737
install::
2838

src/darwintracelib1.0/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ INSTALLDIR = $(TCL_PACKAGE_PATH)/darwintrace1.0
3838

3939

4040
# The library that contains code shared among pextlib1.0 and darwintracelib1.0
41-
DARWINTRACE_SHARE_LIB = $(srcdir)/../darwintrace_share/darwintrace_share.a
41+
DARWINTRACE_SHARE_LIB = $(srcdir)/../darwintrace_share/darwintrace_share_for_darwintrace.a
4242
LIBS+= $(DARWINTRACE_SHARE_LIB)
4343
$(SHLIB_NAME):: $(DARWINTRACE_SHARE_LIB)
4444

0 commit comments

Comments
 (0)