summaryrefslogtreecommitdiff
path: root/solenv/inc/tg_shl.mk
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-06-17 17:44:33 +0300
committerTor Lillqvist <tlillqvist@novell.com>2011-06-17 17:44:45 +0300
commita89fa61cb9b18b58a84f34c5b1f628724198a3df (patch)
treece6ee543ff6dd10769204279b520317a73dfbffa /solenv/inc/tg_shl.mk
parent4dfe99b886d397d2d5784df88bc00d6a415e4b11 (diff)
Fix some WNTGCC typos and thinkos
Diffstat (limited to 'solenv/inc/tg_shl.mk')
-rw-r--r--solenv/inc/tg_shl.mk8
1 files changed, 5 insertions, 3 deletions
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index e8c2b7596a16..f4a0f17a4ac0 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -101,7 +101,9 @@ USE_$(TNR)IMPLIB=-Wl,--out-implib=$(SHL$(TNR)IMPLIBN)
ALLTAR : $(SHL$(TNR)IMPLIBN)
.IF "$(USE_DEFFILE)"==""
+.IF "$(COM)" != "GCC"
USE_$(TNR)IMPLIB_DEPS=$(LB)/$(SHL$(TNR)IMPLIB).lib
+.ENDIF
.ENDIF # "$(USE_DEFFILE)"==""
.ENDIF # "$(GUI)" == "WNT"
USE_SHL$(TNR)DEF=$(SHL$(TNR)DEF)
@@ -338,13 +340,13 @@ $(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 \
+ $(COMMAND_ECHO)$(DLLTOOL) @$(mktmp $(strip \
--dllname $(SHL$(TNR)TARGET)$(DLLPOST) \
--kill-at \
--output-exp $(MISC)/$(@:b)_exp.o \
$(SHL$(TNR)VERSIONOBJ) \
- @(ALL$(TNR)OBJLIST)
- )
+ $(ALL$(TNR)OBJLIST) \
+ ))
$(COMMAND_ECHO)$(LINK) @$(mktmp $(strip \
$(SHL$(TNR)LINKFLAGS) \
$(LINKFLAGSSHL) \