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

(-)share/make/winshlib.mk (-1 / +3 lines)
Lines 4-9 Link Here
4
4
5
BASE = $(shell basename $(SHLIB) .dll)
5
BASE = $(shell basename $(SHLIB) .dll)
6
6
7
ADDQU = 's/[^ ][^ ]*/"&"/g'
8
7
## do it with explicit rules as packages might add dependencies to this target
9
## do it with explicit rules as packages might add dependencies to this target
8
## (attempts to do this GNUishly failed for parallel makes,
10
## (attempts to do this GNUishly failed for parallel makes,
9
## but we do want the link targets echoed)
11
## but we do want the link targets echoed)
Lines 14-20 Link Here
14
	    $(SHLIB_LD) -shared $(DLLFLAGS) -o $@ $(BASE)-win.def $(OBJECTS) $(ALL_LIBS); \
16
	    $(SHLIB_LD) -shared $(DLLFLAGS) -o $@ $(BASE)-win.def $(OBJECTS) $(ALL_LIBS); \
15
	  else \
17
	  else \
16
	    echo EXPORTS > tmp.def; \
18
	    echo EXPORTS > tmp.def; \
17
	    $(NM) $^ | $(SED) -n $(SYMPAT) $(NM_FILTER) >> tmp.def; \
19
	    $(NM) $^ | $(SED) -n $(SYMPAT) $(NM_FILTER) | $(SED) $(ADDQU)  >> tmp.def; \
18
	    echo $(SHLIB_LD) -shared $(DLLFLAGS) -o $@ tmp.def $(OBJECTS) $(ALL_LIBS); \
20
	    echo $(SHLIB_LD) -shared $(DLLFLAGS) -o $@ tmp.def $(OBJECTS) $(ALL_LIBS); \
19
	    $(SHLIB_LD) -shared $(DLLFLAGS) -o $@ tmp.def $(OBJECTS) $(ALL_LIBS); \
21
	    $(SHLIB_LD) -shared $(DLLFLAGS) -o $@ tmp.def $(OBJECTS) $(ALL_LIBS); \
20
	    $(RM) tmp.def; \
22
	    $(RM) tmp.def; \

Return to bug 17130