]>
Commit | Line | Data |
---|---|---|
c0db8343 ER |
1 | --- httpd-2.2.17/build/rules.mk.in~ 2006-07-12 06:38:44.000000000 +0300 |
2 | +++ httpd-2.2.17/build/rules.mk.in 2011-03-26 18:27:36.410587573 +0200 | |
817912fe AM |
3 | @@ -41,17 +41,17 @@ |
4 | COMPILE = $(BASE_CC) $(PICFLAGS) | |
5 | CXX_COMPILE = $(BASE_CXX) $(PICFLAGS) | |
c0db8343 | 6 | |
817912fe AM |
7 | -SH_COMPILE = $(LIBTOOL) --mode=compile $(BASE_CC) $(SHLTCFLAGS) -c $< && touch $@ |
8 | -SH_CXX_COMPILE = $(LIBTOOL) --mode=compile $(BASE_CXX) $(SHLTCFLAGS) -c $< && touch $@ | |
9 | +SH_COMPILE = $(LIBTOOL) --mode=compile --tag=CC $(BASE_CC) $(SHLTCFLAGS) -c $< && touch $@ | |
10 | +SH_CXX_COMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(BASE_CXX) $(SHLTCFLAGS) -c $< && touch $@ | |
c0db8343 | 11 | |
817912fe AM |
12 | -LT_COMPILE = $(LIBTOOL) --mode=compile $(COMPILE) $(LTCFLAGS) -c $< && touch $@ |
13 | -LT_CXX_COMPILE = $(LIBTOOL) --mode=compile $(CXX_COMPILE) $(LTCFLAGS) -c $< && touch $@ | |
14 | +LT_COMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE) $(LTCFLAGS) -c $< && touch $@ | |
15 | +LT_CXX_COMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX_COMPILE) $(LTCFLAGS) -c $< && touch $@ | |
c0db8343 ER |
16 | |
17 | # Link-related commands | |
18 | ||
817912fe | 19 | -LINK = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(PILDFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ |
c0db8343 ER |
20 | -SH_LINK = $(SH_LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@ |
21 | -MOD_LINK = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ | |
817912fe | 22 | +LINK = $(LIBTOOL) --mode=link --tag=CC $(CC) $(ALL_CFLAGS) $(PILDFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ |
c0db8343 ER |
23 | +SH_LINK = $(SH_LIBTOOL) --mode=link --tag=CC $(CC) $(ALL_CFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@ |
24 | +MOD_LINK = $(LIBTOOL) --mode=link --tag=CC $(CC) $(ALL_CFLAGS) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ | |
25 | ||
26 | # Cross compile commands | |
27 | ||
28 | @@ -216,7 +216,7 @@ | |
29 | ||
30 | # Makes an import library from a def file | |
31 | .def.la: | |
32 | - $(LIBTOOL) --mode=compile $(MK_IMPLIB) -o $@ $< | |
33 | + $(LIBTOOL) --mode=compile --tag=CC $(MK_IMPLIB) -o $@ $< | |
34 | ||
35 | # | |
36 | # Dependencies | |
99027768 ER |
37 | --- httpd-2.4.16/support/Makefile.in 2015-09-11 16:11:56.135519322 +0300 |
38 | +++ httpd-2.4.16/support/Makefile.in 2015-09-11 16:16:16.075587666 +0300 | |
39 | @@ -62,10 +62,10 @@ | |
40 | ab_OBJECTS = ab.lo | |
41 | ab_LDADD = $(PROGRAM_LDADD) $(MATH_LIBS) | |
42 | ab.lo: ab.c | |
43 | - $(LIBTOOL) --mode=compile $(CC) $(ab_CFLAGS) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \ | |
44 | + $(LIBTOOL) --mode=compile --tag=CC $(CC) $(ab_CFLAGS) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \ | |
45 | $(ALL_INCLUDES) $(PICFLAGS) $(LTCFLAGS) -c $< && touch $@ | |
46 | ab: $(ab_OBJECTS) | |
47 | - $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(ab_LDFLAGS) $(PILDFLAGS) \ | |
48 | + $(LIBTOOL) --mode=link --tag=CC $(CC) $(ALL_CFLAGS) $(ab_LDFLAGS) $(PILDFLAGS) \ | |
49 | $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ $(ab_LTFLAGS) $(ab_OBJECTS) $(ab_LDADD) | |
50 | ||
51 | checkgid_OBJECTS = checkgid.lo | |
52 | --- httpd-2.4.16/support/apxs.in~ 2015-09-11 16:01:29.000000000 +0300 | |
53 | +++ httpd-2.4.16/support/apxs.in 2015-09-11 16:02:27.246251056 +0300 | |
54 | @@ -430,7 +430,7 @@ | |
55 | $la =~ s|\.c$|.la|; | |
56 | my $o = $s; | |
57 | $o =~ s|\.c$|.o|; | |
58 | - push(@cmds, "$libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $apr_includedir $apu_includedir $opt -c -o $lo $s && touch $slo"); | |
59 | + push(@cmds, "$libtool $ltflags --mode=compile --tag=CC $CFG_CC $cflags -I$CFG_INCLUDEDIR $apr_includedir $apu_includedir $opt -c -o $lo $s && touch $slo"); | |
60 | unshift(@objs, $lo); | |
61 | } | |
62 | ||
63 | @@ -471,7 +471,7 @@ | |
64 | $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version $apr_ldflags"; | |
65 | } | |
66 | ||
67 | - push(@cmds, "$libtool $ltflags --mode=link $CFG_CC $ldflags -o $dso_file $opt $lo"); | |
68 | + push(@cmds, "$libtool $ltflags --mode=link --tag=CC $CFG_CC $ldflags -o $dso_file $opt $lo"); | |
69 | ||
70 | # execute the commands | |
71 | &execute_cmds(@cmds); |