From 950b5fc4a4b654a141216311145038e2be25f8c8 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Mon, 8 Jun 2009 12:33:47 +0000 Subject: [PATCH] 2009-06-08 14:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * config/wce/mingwarm.cf ! Fixed 'del' command receiving wrongly formed path seps in non-msys mode when lib creation failed. --- harbour/ChangeLog | 5 +++++ harbour/config/wce/mingwarm.cf | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 4d2cd2c46d..c2c0194854 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,11 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-06-08 14:33 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * config/wce/mingwarm.cf + ! Fixed 'del' command receiving wrongly formed path seps + in non-msys mode when lib creation failed. + 2009-06-08 14:14 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/source/vm/hvm.c * removed unnecessary stack preloading in hb_vmProc() and MT builds diff --git a/harbour/config/wce/mingwarm.cf b/harbour/config/wce/mingwarm.cf index 43dcd40877..b90e362610 100644 --- a/harbour/config/wce/mingwarm.cf +++ b/harbour/config/wce/mingwarm.cf @@ -141,7 +141,12 @@ endif endif ifeq ($(AR_RULE),) -AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(LIB_DIR)/$@ +ifeq ($(SHLVL),) # COMMAND.COM +LIB_DIR_DOS_ = $(subst /,\,$(LIB_DIR))\$@ +else +LIB_DIR_DOS_ = $(LIB_DIR)/$@ +endif +AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(LIB_DIR_DOS_) # our libs have a lot of cross referenced now and we have to group them # until we won't have cleaned them LINKLIBS = $(LINKPATHS) -Wl,--start-group $(LDLIBS) -Wl,--end-group $(SYSLIBS)