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

(-)httpd-2.2.13/build/rules.mk.in (-8 / +8 lines)
Lines 38-54 Link Here
38
COMPILE      = $(BASE_CC) @PICFLAGS@
38
COMPILE      = $(BASE_CC) @PICFLAGS@
39
CXX_COMPILE  = $(BASE_CXX) @PICFLAGS@
39
CXX_COMPILE  = $(BASE_CXX) @PICFLAGS@
40
40
41
SH_COMPILE     = $(LIBTOOL) --mode=compile $(BASE_CC) @SHLTCFLAGS@ -c $< && touch $@
41
SH_COMPILE     = $(LIBTOOL) --mode=compile --tag=CC $(BASE_CC) @SHLTCFLAGS@ -c $< && touch $@
42
SH_CXX_COMPILE = $(LIBTOOL) --mode=compile $(BASE_CXX) @SHLTCFLAGS@ -c $< && touch $@
42
SH_CXX_COMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(BASE_CXX) @SHLTCFLAGS@ -c $< && touch $@
43
43
44
LT_COMPILE     = $(LIBTOOL) --mode=compile $(COMPILE) @LTCFLAGS@ -c $< && touch $@
44
LT_COMPILE     = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE) @LTCFLAGS@ -c $< && touch $@
45
LT_CXX_COMPILE = $(LIBTOOL) --mode=compile $(CXX_COMPILE) @LTCFLAGS@ -c $< && touch $@
45
LT_CXX_COMPILE = $(LIBTOOL) --mode=compile --tag=CXX $(CXX_COMPILE) @LTCFLAGS@ -c $< && touch $@
46
46
47
# Link-related commands
47
# Link-related commands
48
48
49
LINK     = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) @PILDFLAGS@ $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
49
LINK     = $(LIBTOOL) --mode=link --tag=CC $(CC) $(ALL_CFLAGS) @PILDFLAGS@ $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
50
SH_LINK  = $(SH_LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@
50
SH_LINK  = $(SH_LIBTOOL) --mode=link --tag=CC $(CC) $(ALL_CFLAGS) $(LT_LDFLAGS) $(ALL_LDFLAGS) $(SH_LDFLAGS) $(CORE_IMPLIB) $(SH_LIBS) -o $@
51
MOD_LINK = $(LIBTOOL) --mode=link $(CC) $(ALL_CFLAGS) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
51
MOD_LINK = $(LIBTOOL) --mode=link --tag=CC $(CC) $(ALL_CFLAGS) -static $(LT_LDFLAGS) $(ALL_LDFLAGS) -o $@
52
52
53
# Cross compile commands
53
# Cross compile commands
54
54
Lines 216-222 Link Here
216
216
217
# Makes an import library from a def file
217
# Makes an import library from a def file
218
.def.la:
218
.def.la:
219
	$(LIBTOOL) --mode=compile $(MK_IMPLIB) -o $@ $<
219
	$(LIBTOOL) --mode=compile --tag=CC $(MK_IMPLIB) -o $@ $<
220
220
221
#
221
#
222
# Dependencies
222
# Dependencies
(-)httpd-2.2.13/srclib/apr/configure.in (-1 / +1 lines)
Lines 205-211 Link Here
205
  [ use_libtool=$withval ], [ use_libtool="yes" ] )
205
  [ use_libtool=$withval ], [ use_libtool="yes" ] )
206
206
207
if test "x$use_libtool" = "xyes"; then
207
if test "x$use_libtool" = "xyes"; then
208
      lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -o $@ -c $< && touch $@'
208
      lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile --tag=CC $(COMPILE) -o $@ -c $< && touch $@'
209
      LT_VERSION="-version-info `$get_version libtool $version_hdr APR`"
209
      LT_VERSION="-version-info `$get_version libtool $version_hdr APR`"
210
      link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) \$(LT_VERSION) \$(ALL_LDFLAGS) -o \$@"
210
      link="\$(LIBTOOL) \$(LTFLAGS) --mode=link \$(LT_LDFLAGS) \$(COMPILE) \$(LT_VERSION) \$(ALL_LDFLAGS) -o \$@"
211
      so_ext='lo'
211
      so_ext='lo'

Return to bug 47691