]>
Commit | Line | Data |
---|---|---|
f3332643 ER |
1 | --- ./build/rules.mk.in.orig 2005-12-12 02:18:07.000000000 +0200 |
2 | +++ ./build/rules.mk.in 2005-12-12 02:18:19.000000000 +0200 | |
3 | @@ -38,17 +38,17 @@ | |
4 | COMPILE = $(BASE_CC) @PICFLAGS@ | |
5 | CXX_COMPILE = $(BASE_CXX) @PICFLAGS@ | |
6 | ||
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 $@ | |
11 | ||
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 $@ | |
16 | ||
17 | # Link-related commands | |
18 | ||
19 | -LINK = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) @PILDFLAGS@ $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ | |
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 $@ | |
22 | +LINK = $(LIBTOOL) --mode=link --tag=CC $(CC) $(ALL_CFLAGS) @PILDFLAGS@ $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@ | |
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 | ||
092bbc0c ER |
28 | --- httpd-2.2.0/support/apxs.in~ 2005-12-21 16:08:29.000000000 +0200 |
29 | +++ httpd-2.2.0/support/apxs.in 2005-12-22 02:13:02.000000000 +0200 | |
30 | @@ -408,7 +408,7 @@ | |
31 | $la =~ s|\.c$|.la|; | |
32 | my $o = $s; | |
33 | $o =~ s|\.c$|.o|; | |
34 | - push(@cmds, "$libtool $ltflags --mode=compile $CFG_CC $cflags -I$CFG_INCLUDEDIR $apr_includedir $apu_includedir $opt -c -o $lo $s && touch $slo"); | |
35 | + 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"); | |
36 | unshift(@objs, $lo); | |
37 | } | |
38 | ||
39 | @@ -445,7 +445,7 @@ | |
40 | $opt .= " -rpath $CFG_LIBEXECDIR -module -avoid-version $apr_ldflags"; | |
41 | } | |
42 | ||
43 | - push(@cmds, "$libtool $ltflags --mode=link $CFG_CC -o $dso_file $opt $lo"); | |
44 | + push(@cmds, "$libtool $ltflags --mode=link --tag=CC $CFG_CC -o $dso_file $opt $lo"); | |
45 | ||
46 | # execute the commands | |
47 | &execute_cmds(@cmds); |