Attachment #187637 for bug #263129

View | Details | Raw Unified | Return to bug 263129
Collapse All | Expand All

Lines 256-261 Link Here

(-)otp_src_R13A~orig/erts/emulator/Makefile.in (-2 / +3 lines)
256	else	256	else
257	CS_CFLAGS = $(CS_CFLAGS_)	257	CS_CFLAGS = $(CS_CFLAGS_)
258	endif	258	endif
		259	CS_LDFLAGS = $(LDFLAGS)
259	CS_LIBS = -L../lib/internal/$(TARGET) -lerts_internal @ERTS_INTERNAL_X_LIBS@	260	CS_LIBS = -L../lib/internal/$(TARGET) -lerts_internal @ERTS_INTERNAL_X_LIBS@
260		261
261	LIBS += @TERMCAP_LIB@ -L../lib/internal/$(TARGET) @ERTS_INTERNAL_X_LIBS@	262	LIBS += @TERMCAP_LIB@ -L../lib/internal/$(TARGET) @ERTS_INTERNAL_X_LIBS@
Lines 654-661 Link Here
654	CS_SRC = sys/$(ERLANG_OSTYPE)/erl_child_setup.c	655	CS_SRC = sys/$(ERLANG_OSTYPE)/erl_child_setup.c
655		656
656	$(BINDIR)/$(CS_EXECUTABLE): $(CS_SRC)	657	$(BINDIR)/$(CS_EXECUTABLE): $(CS_SRC)
657	$(CS_PURIFY) $(CC) -o $(BINDIR)/$(CS_EXECUTABLE) \	658	$(CS_PURIFY) $(CC) $(CS_LDFLAGS) -o $(BINDIR)/$(CS_EXECUTABLE) \
658	$(CS_CFLAGS) $(COMMON_INCLUDES) $(CS_SRC) $(CS_LIBS)	659	$(CS_CFLAGS) $(COMMON_INCLUDES) $(CS_SRC) $(CS_LIBS)
659		660
660	$(OBJDIR)/%.elib.o: beam/%.c	661	$(OBJDIR)/%.elib.o: beam/%.c
661	$(CC) $(ELIB_FLAGS) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@	662	$(CC) $(ELIB_FLAGS) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@

Lines 60-66 Link Here

(-)otp_src_R13A~orig/lib/asn1/c_src/Makefile.in (-1 / +1 lines)
60	DRIVER_INCLUDES = -I$(ERL_TOP)/erts/emulator/beam \	60	DRIVER_INCLUDES = -I$(ERL_TOP)/erts/emulator/beam \
61	-I$(ERL_TOP)/erts/emulator/sys/$(ERLANG_OSTYPE)	61	-I$(ERL_TOP)/erts/emulator/sys/$(ERLANG_OSTYPE)
62	CFLAGS = $(DRIVER_INCLUDES) $(EI_INCLUDES) @DED_CFLAGS@	62	CFLAGS = $(DRIVER_INCLUDES) $(EI_INCLUDES) @DED_CFLAGS@
63	LDFLAGS = @DED_LDFLAGS@	63	LDFLAGS += @DED_LDFLAGS@
64		64
65	LD_INCL_EI = -L$(EI_LIBDIR)	65	LD_INCL_EI = -L$(EI_LIBDIR)
66		66

Lines 33-39 Link Here

(-)otp_src_R13A~orig/lib/crypto/c_src/Makefile.in (-1 / +1 lines)
33	LD = @DED_LD@	33	LD = @DED_LD@
34	SHELL = /bin/sh	34	SHELL = /bin/sh
35	LIBS = @LIBS@	35	LIBS = @LIBS@
36	LDFLAGS = @DED_LDFLAGS@	36	LDFLAGS += @DED_LDFLAGS@
37	CFLAGS = @DED_CFLAGS@	37	CFLAGS = @DED_CFLAGS@
38	ERLANG_OSTYPE = @ERLANG_OSTYPE@	38	ERLANG_OSTYPE = @ERLANG_OSTYPE@
39	TARGET = @host@	39	TARGET = @host@

Lines 715-725 Link Here

(-)otp_src_R13A~orig/lib/erl_interface/src/Makefile.in (-2 / +2 lines)
715	else	715	else
716	ifdef THR_DEFS	716	ifdef THR_DEFS
717	$(ERL_CALL): $(ERLCALL) ../include/ei.h $(MT_EILIB)	717	$(ERL_CALL): $(ERLCALL) ../include/ei.h $(MT_EILIB)
718	$(PURIFY) $(CC) $(PROG_CFLAGS) $(THR_DEFS) -o $@ $(ERLCALL) \	718	$(PURIFY) $(CC) $(PROG_CFLAGS) $(THR_DEFS) $(LDFLAGS) -o $@ $(ERLCALL) \
719	-L$(OBJDIR) -lei $(THR_LIBS) $(LIBS)	719	-L$(OBJDIR) -lei $(THR_LIBS) $(LIBS)
720	else	720	else
721	$(ERL_CALL): $(ERLCALL) ../include/ei.h $(ST_EILIB)	721	$(ERL_CALL): $(ERLCALL) ../include/ei.h $(ST_EILIB)
722	$(PURIFY) $(CC) $(PROG_CFLAGS) -o $@ $(ERLCALL) \	722	$(PURIFY) $(CC) $(PROG_CFLAGS) $(LDFLAGS) -o $@ $(ERLCALL) \
723	-L$(OBJDIR) -lei $(LIBS)	723	-L$(OBJDIR) -lei $(LIBS)
724	endif	724	endif
725	endif	725	endif

Lines 48-54 Link Here

(-)otp_src_R13A~orig/lib/megaco/src/flex/Makefile.in (-1 / +1 lines)
48	CC = @CC@	48	CC = @CC@
49	CFLAGS_MT = $(CFLAGS) -D_THREAD_SAFE -D_REENTRANT	49	CFLAGS_MT = $(CFLAGS) -D_THREAD_SAFE -D_REENTRANT
50	LD = @DED_LD@	50	LD = @DED_LD@
51	LDFLAGS = @DED_LDFLAGS@	51	LDFLAGS += @DED_LDFLAGS@
52	LEX = @LEX@	52	LEX = @LEX@
53	LEXLIB = @LEXLIB@	53	LEXLIB = @LEXLIB@
54	PERL = @PERL@	54	PERL = @PERL@

Lines 35-41 Link Here

(-)otp_src_R13A~orig/lib/runtime_tools/c_src/Makefile.in (-1 / +1 lines)
35	LD = @DED_LD@	35	LD = @DED_LD@
36	SHELL = /bin/sh	36	SHELL = /bin/sh
37	LIBS = @LIBS@	37	LIBS = @LIBS@
38	LDFLAGS = @DED_LDFLAGS@	38	LDFLAGS += @DED_LDFLAGS@
39	ERLANG_OSTYPE = @ERLANG_OSTYPE@	39	ERLANG_OSTYPE = @ERLANG_OSTYPE@
40		40
41	SYSINCLUDE = -I$(ERL_TOP)/erts/emulator/beam \	41	SYSINCLUDE = -I$(ERL_TOP)/erts/emulator/beam \

Lines 163-169 Link Here

(-)otp_src_R13A~orig/lib/ssl/c_src/Makefile.in (-1 / +1 lines)
163		163
164	# Unix	164	# Unix
165	$(BINDIR)/ssl_esock: $(OBJS)	165	$(BINDIR)/ssl_esock: $(OBJS)
166	$(CC) $(CC_R_OPT) $(PLAIN_CFLAGS) -o $@ $^ $(LIBS) $(SSL_LINK_LIB)	166	$(CC) $(CC_R_OPT) $(PLAIN_CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(SSL_LINK_LIB)
167		167
168	# Win32/Cygwin	168	# Win32/Cygwin
169	$(BINDIR)/ssl_esock.exe: $(OBJS)	169	$(BINDIR)/ssl_esock.exe: $(OBJS)

Return to bug 263129