diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-18 00:00:20 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-06-18 00:00:20 +0300 |
| commit | 0dad904cb5af27cb85c7a5caf26b982ac960add8 (patch) | |
| tree | 2b71d70ad1b66adbd33700f86528c902be560911 /solenv/inc/tg_shl.mk | |
| parent | a08471366363db51fc43ac047c2efac032566625 (diff) | |
Attempt to fix MinGW build, dlltool not needed it seems
Diffstat (limited to 'solenv/inc/tg_shl.mk')
| -rw-r--r-- | solenv/inc/tg_shl.mk | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk index f4a0f17a4ac0..4e10c6bc958f 100644 --- a/solenv/inc/tg_shl.mk +++ b/solenv/inc/tg_shl.mk @@ -318,7 +318,7 @@ $(SHL$(TNR)TARGETN) : \ .IF "$(COM)"=="GCC" # always have to call dlltool explicitly as ld cannot handle # comment in .def # GNU ld since 2.17 supports @cmdfile syntax .IF "$(USE_DEFFILE)"!="" - @$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \ + $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \ $(SHL$(TNR)LINKFLAGS) \ $(LINKFLAGSSHL) \ $(SOLARLIB) \ @@ -340,13 +340,6 @@ $(SHL$(TNR)TARGETN) : \ @noop $(assign DEF$(TNR)OBJLIST:=$(shell $(TYPE) $(foreach,i,$(DEFLIB$(TNR)NAME) $(SLB)/$(i).lib) | sed s?$(ROUT)?$(PRJ)/$(ROUT)?g)) @noop $(foreach,i,$(DEF$(TNR)OBJLIST) $(assign ALL$(TNR)OBJLIST:=$(ALL$(TNR)OBJLIST:s?$i??))) .ENDIF # "$(DEFLIB$(TNR)NAME)"!="" - $(COMMAND_ECHO)$(DLLTOOL) @$(mktmp $(strip \ - --dllname $(SHL$(TNR)TARGET)$(DLLPOST) \ - --kill-at \ - --output-exp $(MISC)/$(@:b)_exp.o \ - $(SHL$(TNR)VERSIONOBJ) \ - $(ALL$(TNR)OBJLIST) \ - )) $(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \ $(SHL$(TNR)LINKFLAGS) \ $(LINKFLAGSSHL) \ @@ -354,7 +347,7 @@ $(SHL$(TNR)TARGETN) : \ $(MINGWSSTDOBJ) \ -o $@ \ -Wl,-Map,$(MISC)/$(@:b).map \ - $(MISC)/$(@:b)_exp.o \ + $(SHL$(TNR)DEF) \ $(USE_$(TNR)IMPLIB) \ $(STDOBJ) \ $(SHL$(TNR)VERSIONOBJ) $(SHL$(TNR)OBJS) \ |