From a209784591b3a50bd3922e0b3f7375e458253b89 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Tue, 11 Aug 2009 07:42:53 +0000
Subject: [PATCH] 2009-08-11 09:41 UTC+0200 Viktor Szakats (harbour.01
 syenar.hu)   * config/bsd/gcc.cf   * config/wce/msvcarm.cf   *
 config/wce/mingwarm.cf   * config/wce/poccarm.cf   * config/darwin/gcc.cf   *
 config/hpux/gcc.cf   * config/dos/watcom.cf   * config/dos/djgpp.cf   *
 config/win/watcom.cf   * config/win/icc.cf   * config/win/cygwin.cf   *
 config/win/msvc.cf   * config/win/xcc.cf   * config/win/mingw.cf   *
 config/win/pocc.cf   * config/win/bcc.cf   * config/linux/watcom.cf   *
 config/linux/gcc.cf   * config/linux/icc.cf   * config/linux/sunpro.cf   *
 config/os2/watcom.cf   * config/os2/gcc.cf   * config/sunos/gcc.cf   *
 config/sunos/sunpro.cf     % Mofified so that HB_USER_AFLAGS is passed
 directly to AR_RULE,       rather than being passed through ARFLAGS. It's
 also done this way       for other HB_USER_* flags.     ! Fixed os2/gcc
 ignoring HB_USER_AFLAGS. Please test.     % ARFLAGS assignments now use :=
 operator.

  * config/global.cf
    + Added few more config vars.
---
 harbour/ChangeLog              | 34 ++++++++++++++++++++++++++++++++++
 harbour/config/bsd/gcc.cf      |  4 ++--
 harbour/config/darwin/gcc.cf   |  4 ++--
 harbour/config/dos/djgpp.cf    |  4 ++--
 harbour/config/dos/watcom.cf   |  4 ++--
 harbour/config/global.cf       |  2 +-
 harbour/config/hpux/gcc.cf     |  4 ++--
 harbour/config/linux/gcc.cf    |  4 ++--
 harbour/config/linux/icc.cf    |  4 ++--
 harbour/config/linux/sunpro.cf |  4 ++--
 harbour/config/linux/watcom.cf |  6 +++---
 harbour/config/os2/gcc.cf      |  4 ++--
 harbour/config/os2/watcom.cf   |  6 +++---
 harbour/config/sunos/gcc.cf    |  4 ++--
 harbour/config/sunos/sunpro.cf |  4 ++--
 harbour/config/wce/mingwarm.cf |  5 ++---
 harbour/config/wce/msvcarm.cf  |  4 ++--
 harbour/config/wce/poccarm.cf  |  4 ++--
 harbour/config/win/bcc.cf      |  6 +++---
 harbour/config/win/cygwin.cf   |  4 ++--
 harbour/config/win/icc.cf      |  4 ++--
 harbour/config/win/mingw.cf    |  5 ++---
 harbour/config/win/msvc.cf     |  4 ++--
 harbour/config/win/pocc.cf     |  4 ++--
 harbour/config/win/watcom.cf   |  4 ++--
 harbour/config/win/xcc.cf      |  4 ++--
 26 files changed, 86 insertions(+), 54 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index cb31d39a48..260de76245 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,40 @@
    past entries belonging to author(s): Viktor Szakats.
 */
 
+2009-08-11 09:41 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
+  * config/bsd/gcc.cf
+  * config/wce/msvcarm.cf
+  * config/wce/mingwarm.cf
+  * config/wce/poccarm.cf
+  * config/darwin/gcc.cf
+  * config/hpux/gcc.cf
+  * config/dos/watcom.cf
+  * config/dos/djgpp.cf
+  * config/win/watcom.cf
+  * config/win/icc.cf
+  * config/win/cygwin.cf
+  * config/win/msvc.cf
+  * config/win/xcc.cf
+  * config/win/mingw.cf
+  * config/win/pocc.cf
+  * config/win/bcc.cf
+  * config/linux/watcom.cf
+  * config/linux/gcc.cf
+  * config/linux/icc.cf
+  * config/linux/sunpro.cf
+  * config/os2/watcom.cf
+  * config/os2/gcc.cf
+  * config/sunos/gcc.cf
+  * config/sunos/sunpro.cf
+    % Mofified so that HB_USER_AFLAGS is passed directly to AR_RULE,
+      rather than being passed through ARFLAGS. It's also done this way
+      for other HB_USER_* flags.
+    ! Fixed os2/gcc ignoring HB_USER_AFLAGS. Please test.
+    % ARFLAGS assignments now use := operator.
+
+  * config/global.cf
+    + Added few more config vars.
+
 2009-08-11 09:27 UTC+0200 Viktor Szakats (harbour.01 syenar.hu)
   * config/bsd/gcc.cf
     % Started using := for CFLAGS/CPPFLAGS.
diff --git a/harbour/config/bsd/gcc.cf b/harbour/config/bsd/gcc.cf
index 6f9a1830fd..6270368a41 100644
--- a/harbour/config/bsd/gcc.cf
+++ b/harbour/config/bsd/gcc.cf
@@ -71,7 +71,7 @@ LINKLIBS += -lm
 LDFLAGS += $(LINKPATHS)
 
 AR := ar
-ARFLAGS = $(HB_USER_AFLAGS)
-AR_RULE = $(AR) $(ARFLAGS) r $(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
+ARFLAGS :=
+AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) r $(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/darwin/gcc.cf b/harbour/config/darwin/gcc.cf
index c2ca3ce1e1..3963b68ee9 100644
--- a/harbour/config/darwin/gcc.cf
+++ b/harbour/config/darwin/gcc.cf
@@ -84,7 +84,7 @@ LDFLAGS += $(LINKPATHS)
 LD_RULE = $(LD) $(CFLAGS) $(LD_OUT) $(BIN_DIR)/$@ $(^F) $(LDFLAGS) $(HB_USER_LDFLAGS) $(LINKLIBS) $(LINKLIBS)
 
 AR := libtool
-ARFLAGS = $(HB_USER_AFLAGS)
-AR_RULE = $(AR) -static $(ARFLAGS) -o $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
+ARFLAGS :=
+AR_RULE = $(AR) -static $(ARFLAGS) $(HB_USER_AFLAGS) -o $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/dos/djgpp.cf b/harbour/config/dos/djgpp.cf
index 667c8b2f52..45b630a736 100644
--- a/harbour/config/dos/djgpp.cf
+++ b/harbour/config/dos/djgpp.cf
@@ -52,7 +52,7 @@ define create_library
 $(foreach file,$(^F),$(lib_object))
 @echo. SAVE >> __lib__.tmp
 @echo. END >> __lib__.tmp
-$(AR) $(ARFLAGS) -M < __lib__.tmp
+$(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -M < __lib__.tmp
 endef
 
 # NOTE: The empty line below HAVE TO exist!
@@ -71,7 +71,7 @@ $(foreach file,$(LINKLIBS),$(link_file))
 endef
 
 AR := ar
-ARFLAGS = $(HB_USER_AFLAGS)
+ARFLAGS :=
 AR_RULE = $(create_library)
 
 LD_RULE = $(link_exe_file)
diff --git a/harbour/config/dos/watcom.cf b/harbour/config/dos/watcom.cf
index a26096ca24..046d688899 100644
--- a/harbour/config/dos/watcom.cf
+++ b/harbour/config/dos/watcom.cf
@@ -115,11 +115,11 @@ endef
 define create_library
 @echo $(LIB_DIR)/$@ > __lib__.tmp
 $(foreach file,$(^F),$(lib_object))
-$(AR) $(ARFLAGS) @__lib__.tmp
+$(AR) $(ARFLAGS) $(HB_USER_AFLAGS) @__lib__.tmp
 endef
 
 AR := wlib
-ARFLAGS = -p=64 -c -n $(HB_USER_AFLAGS)
+ARFLAGS := -p=64 -c -n
 AR_RULE = $(create_library)
 
 # disable DOS/4GW Banner
diff --git a/harbour/config/global.cf b/harbour/config/global.cf
index dffad50cb6..dbc8e2c803 100644
--- a/harbour/config/global.cf
+++ b/harbour/config/global.cf
@@ -176,7 +176,7 @@ ifeq ($(HB_CONFIG_SHOWN),)
 
       # Some additional ones to be given a standard name:
       #   HB_HOST_BUILD, HB_XBUILD, HB_WITHOUT_*, HB_REBUILD_PARSER, HB_DB_DRVEXT
-      #   HB_COMMERCE, HB_CRS_LIB, HB_BUILD_VERBOSE
+      #   HB_COMMERCE, HB_CRS_LIB, HB_BUILD_VERBOSE, HB_BIN_COMPILE, HB_INC_COMPILE
 
       ifeq ($(HB_DYNLIB),yes)
          $(info ! Dynamic library creation phase)
diff --git a/harbour/config/hpux/gcc.cf b/harbour/config/hpux/gcc.cf
index 53789ad54a..50a0258560 100644
--- a/harbour/config/hpux/gcc.cf
+++ b/harbour/config/hpux/gcc.cf
@@ -74,7 +74,7 @@ LINKLIBS += -lm -lrt
 LDFLAGS += $(LINKPATHS)
 
 AR := ar
-ARFLAGS = $(HB_USER_AFLAGS)
-AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
+ARFLAGS :=
+AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) cr $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/linux/gcc.cf b/harbour/config/linux/gcc.cf
index 22a82d472f..a41b81991d 100644
--- a/harbour/config/linux/gcc.cf
+++ b/harbour/config/linux/gcc.cf
@@ -87,7 +87,7 @@ LINKLIBS += -lm -lrt -ldl
 LDFLAGS = $(LINKPATHS)
 
 AR := $(HB_CCPREFIX)ar
-ARFLAGS = $(HB_USER_AFLAGS)
-AR_RULE = $(AR) $(ARFLAGS) crs $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
+ARFLAGS :=
+AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) crs $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/linux/icc.cf b/harbour/config/linux/icc.cf
index 0557701948..af5e1b3401 100644
--- a/harbour/config/linux/icc.cf
+++ b/harbour/config/linux/icc.cf
@@ -81,7 +81,7 @@ LINKLIBS += -lm -lrt -ldl
 LDFLAGS = $(LINKPATHS)
 
 AR := xiar
-ARFLAGS = $(HB_USER_AFLAGS)
-AR_RULE = $(AR) $(ARFLAGS) crs $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
+ARFLAGS :=
+AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) crs $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/linux/sunpro.cf b/harbour/config/linux/sunpro.cf
index 463910da5e..5f127d79fc 100644
--- a/harbour/config/linux/sunpro.cf
+++ b/harbour/config/linux/sunpro.cf
@@ -90,7 +90,7 @@ LINKLIBS += -lm -lrt -ldl
 LDFLAGS += $(LINKPATHS)
 
 AR := $(HB_CCPREFIX)ar
-ARFLAGS = $(HB_USER_AFLAGS)
-AR_RULE = $(AR) $(ARFLAGS) crs $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
+ARFLAGS :=
+AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) crs $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/linux/watcom.cf b/harbour/config/linux/watcom.cf
index 052115b24f..111ecafc31 100644
--- a/harbour/config/linux/watcom.cf
+++ b/harbour/config/linux/watcom.cf
@@ -82,8 +82,8 @@ ifneq ($(LDLIBS),)
 endif
 
 AR := wlib
-# ARFLAGS = -c -n -fa $(HB_USER_AFLAGS)
-ARFLAGS = -c -n $(HB_USER_AFLAGS)
-AR_RULE = $(AR) $(ARFLAGS) $(LIB_DIR)/$@ $(foreach file,$(^F),-+$(file))
+# ARFLAGS := -c -n -fa
+ARFLAGS := -c -n
+AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) $(LIB_DIR)/$@ $(foreach file,$(^F),-+$(file))
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/os2/gcc.cf b/harbour/config/os2/gcc.cf
index 3cac201624..9faf793041 100644
--- a/harbour/config/os2/gcc.cf
+++ b/harbour/config/os2/gcc.cf
@@ -86,12 +86,12 @@ echo CREATE $(LIB_DIR)/$@ > __lib__.tmp
 for %i in ( *$(OBJ_EXT) ) do @echo ADDMOD %i >> __lib__.tmp
 echo SAVE >> __lib__.tmp
 echo END >> __lib__.tmp
-$(AR) -M < __lib__.tmp
+$(AR) $(ARFLAGS) $(HB_USER_AFLAGS) -M < __lib__.tmp
 endef
 
 # Under OS/2 || isn't a command separator (inside a shell, that is); correct separator is &
 AR := ar
-ARFLAGS = $(HB_USER_AFLAGS)
+ARFLAGS :=
 AR_RULE = $(create_library) & $(RM) __lib__.tmp
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/os2/watcom.cf b/harbour/config/os2/watcom.cf
index 2f0c464fce..d4dc116dbc 100644
--- a/harbour/config/os2/watcom.cf
+++ b/harbour/config/os2/watcom.cf
@@ -79,7 +79,7 @@ LDLIBS  = $(subst $(space),$(comma) ,$(strip $(LINKLIBS)))
 LD_RULE = $(LD) $(LDFLAGS) $(HB_USER_LDFLAGS) NAME $(BIN_DIR)/$@ FILE $(LDFILES) $(if $(LDLIBS), LIB $(LDLIBS),)
 
 ifeq ($(HB_SHELL),sh)
-create_library = $(AR) $(ARFLAGS) $(LIB_DIR)/$@ $(foreach file,$(^F),-+$(file))
+create_library = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) $(LIB_DIR)/$@ $(foreach file,$(^F),-+$(file))
 else
 # maximum size of command line in OS2 is limited to 1024 characters
 # the trick with divided 'wordlist' is workaround for it:
@@ -92,12 +92,12 @@ else
 define create_library
 echo $(LIB_DIR)/$@ > __lib__.tmp
 for %i in ( *$(OBJ_EXT) ) do @echo -+%i >> __lib__.tmp
-$(AR) $(ARFLAGS) @__lib__.tmp
+$(AR) $(ARFLAGS) $(HB_USER_AFLAGS) @__lib__.tmp
 endef
 endif
 
 AR := wlib
-ARFLAGS = -p=64 -c -n $(HB_USER_AFLAGS)
+ARFLAGS := -p=64 -c -n
 AR_RULE = $(create_library)
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/sunos/gcc.cf b/harbour/config/sunos/gcc.cf
index 8c65cf5846..a09abe07d6 100644
--- a/harbour/config/sunos/gcc.cf
+++ b/harbour/config/sunos/gcc.cf
@@ -74,7 +74,7 @@ LINKLIBS += -lsocket -lnsl -lresolv
 LDFLAGS += $(LINKPATHS)
 
 AR := ar
-ARFLAGS = $(HB_USER_AFLAGS)
-AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
+ARFLAGS :=
+AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) cr $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/sunos/sunpro.cf b/harbour/config/sunos/sunpro.cf
index 9d2395abcf..d4bfc54575 100644
--- a/harbour/config/sunos/sunpro.cf
+++ b/harbour/config/sunos/sunpro.cf
@@ -96,7 +96,7 @@ LINKLIBS += -lsocket -lnsl -lresolv
 LDFLAGS += $(LINKPATHS)
 
 AR := ar
-ARFLAGS = $(HB_USER_AFLAGS)
-AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
+ARFLAGS :=
+AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) cr $(LIB_DIR)/$@ $(^F) || ( $(RM) $(LIB_DIR)/$@ && false )
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/wce/mingwarm.cf b/harbour/config/wce/mingwarm.cf
index caeac904c8..3068aa0abc 100644
--- a/harbour/config/wce/mingwarm.cf
+++ b/harbour/config/wce/mingwarm.cf
@@ -44,8 +44,7 @@ LDFLAGS += $(LINKPATHS)
 RANLIB := $(HB_CCPREFIX)ranlib
 
 AR := $(HB_CCPREFIX)ar
-ARFLAGS = $(HB_USER_AFLAGS)
-
-AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@)
+ARFLAGS :=
+AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@)
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/wce/msvcarm.cf b/harbour/config/wce/msvcarm.cf
index 8f9f18b6d3..1357a85107 100644
--- a/harbour/config/wce/msvcarm.cf
+++ b/harbour/config/wce/msvcarm.cf
@@ -61,7 +61,7 @@ LINKLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT))
 LDFLAGS = /nologo $(LINKPATHS)
 
 AR := lib.exe
-ARFLAGS = $(HB_USER_AFLAGS)
-AR_RULE = $(AR) $(ARFLAGS) /nologo /out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
+ARFLAGS :=
+AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) /nologo /out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/wce/poccarm.cf b/harbour/config/wce/poccarm.cf
index bbf3f69207..f70c42b1c4 100644
--- a/harbour/config/wce/poccarm.cf
+++ b/harbour/config/wce/poccarm.cf
@@ -48,7 +48,7 @@ LDFLAGS = $(LINKPATHS) coredll.lib corelibc.lib winsock.lib ws2.lib
 LDFLAGS += /SUBSYSTEM:WINDOWS
 
 AR := polib.exe
-ARFLAGS = $(HB_USER_AFLAGS)
-AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F)
+ARFLAGS :=
+AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) /out:$(LIB_DIR)/$@ $(^F)
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/win/bcc.cf b/harbour/config/win/bcc.cf
index 22ca567fac..bd35a949ca 100644
--- a/harbour/config/win/bcc.cf
+++ b/harbour/config/win/bcc.cf
@@ -45,7 +45,7 @@ LDFLAGS += $(LINKPATHS)
 
 # create library rules
 AR := tlib.exe
-ARFLAGS = /P64 $(HB_USER_AFLAGS)
+ARFLAGS := /P64
 
 ifneq ($(HB_SHELL),sh)
 
@@ -59,7 +59,7 @@ define create_library
 @if exist __lib__.tmp del __lib__.tmp
 $(foreach file,$(^F),$(lib_object))
 @echo -+>> __lib__.tmp
-$(AR) $(ARFLAGS) "$(subst /,\,$(LIB_DIR)/$@)" @__lib__.tmp
+$(AR) $(ARFLAGS) $(HB_USER_AFLAGS) "$(subst /,\,$(LIB_DIR)/$@)" @__lib__.tmp
 endef
 
 AR_RULE = $(create_library)
@@ -67,7 +67,7 @@ AR_RULE = $(create_library)
 else # sh
 
 AROBJS = $(foreach file,$(^F),-+$(file))
-AR_RULE = $(AR) $(ARFLAGS) "$(subst /,\,$(LIB_DIR)/$@)" $(AROBJS)
+AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) "$(subst /,\,$(LIB_DIR)/$@)" $(AROBJS)
 
 endif
 
diff --git a/harbour/config/win/cygwin.cf b/harbour/config/win/cygwin.cf
index 031e7f695b..736f774064 100644
--- a/harbour/config/win/cygwin.cf
+++ b/harbour/config/win/cygwin.cf
@@ -45,7 +45,7 @@ LINKLIBS += -luser32 -lgdi32 -lws2_32
 LDFLAGS = $(LINKPATHS)
 
 AR := ar
-ARFLAGS = $(HB_USER_AFLAGS)
-AR_RULE = $(AR) $(ARFLAGS) r $(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
+ARFLAGS :=
+AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) r $(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/win/icc.cf b/harbour/config/win/icc.cf
index 7a89270536..551d7eafe9 100644
--- a/harbour/config/win/icc.cf
+++ b/harbour/config/win/icc.cf
@@ -46,7 +46,7 @@ LINKLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT))
 LDFLAGS = $(LINKPATHS) user32.lib ws2_32.lib advapi32.lib gdi32.lib
 
 AR := xilib.exe
-ARFLAGS = $(HB_USER_AFLAGS)
-AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
+ARFLAGS :=
+AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) /out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/win/mingw.cf b/harbour/config/win/mingw.cf
index 315316a162..87c562f51a 100644
--- a/harbour/config/win/mingw.cf
+++ b/harbour/config/win/mingw.cf
@@ -54,8 +54,7 @@ LDFLAGS += $(LINKPATHS)
 RANLIB := $(HB_CCPREFIX)ranlib
 
 AR := $(HB_CCPREFIX)ar
-ARFLAGS = $(HB_USER_AFLAGS)
-
-AR_RULE = $(AR) $(ARFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@)
+ARFLAGS :=
+AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) cr $(LIB_DIR)/$@ $(^F) && $(RANLIB) $(LIB_DIR)/$@ || $(RM) $(subst /,$(DIRSEP),$(LIB_DIR)/$@)
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/win/msvc.cf b/harbour/config/win/msvc.cf
index 5f5638046e..71c0a62bfb 100644
--- a/harbour/config/win/msvc.cf
+++ b/harbour/config/win/msvc.cf
@@ -56,7 +56,7 @@ LINKLIBS = $(foreach lib,$(LIBS),$(lib)$(LIB_EXT))
 LDFLAGS = /nologo $(LINKPATHS) user32.lib ws2_32.lib advapi32.lib gdi32.lib
 
 AR := lib.exe
-ARFLAGS = $(HB_USER_AFLAGS)
-AR_RULE = $(AR) $(ARFLAGS) /nologo /out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
+ARFLAGS :=
+AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) /nologo /out:$(LIB_DIR)/$@ $(^F) || $(RM) $(LIB_DIR)/$@
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/win/pocc.cf b/harbour/config/win/pocc.cf
index efde21f2e7..32c6c75554 100644
--- a/harbour/config/win/pocc.cf
+++ b/harbour/config/win/pocc.cf
@@ -45,7 +45,7 @@ LDFLAGS = $(LINKPATHS) kernel32.lib user32.lib ws2_32.lib advapi32.lib gdi32.lib
 LDFLAGS += /SUBSYSTEM:CONSOLE
 
 AR := polib.exe
-ARFLAGS = $(HB_USER_AFLAGS)
-AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F)
+ARFLAGS :=
+AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) /out:$(LIB_DIR)/$@ $(^F)
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/win/watcom.cf b/harbour/config/win/watcom.cf
index 5a53f39679..5ce03d21a0 100644
--- a/harbour/config/win/watcom.cf
+++ b/harbour/config/win/watcom.cf
@@ -104,11 +104,11 @@ endef
 define create_library
 @echo $(LIB_DIR)/$@ > __lib__.tmp
 $(foreach file,$(^F),$(lib_object))
-$(AR) $(ARFLAGS) @__lib__.tmp
+$(AR) $(ARFLAGS) $(HB_USER_AFLAGS) @__lib__.tmp
 endef
 
 AR := wlib
-ARFLAGS = -p=64 -c -n $(HB_USER_AFLAGS)
+ARFLAGS := -p=64 -c -n
 AR_RULE = $(create_library)
 
 include $(TOP)$(ROOT)config/rules.cf
diff --git a/harbour/config/win/xcc.cf b/harbour/config/win/xcc.cf
index f41ee5d3d0..4a7c93a37e 100644
--- a/harbour/config/win/xcc.cf
+++ b/harbour/config/win/xcc.cf
@@ -38,7 +38,7 @@ LINKLIBS += $(foreach lib,$(LIBS),$(lib)$(LIB_EXT))
 LDFLAGS = $(LINKPATHS) kernel32.lib user32.lib ws2_32.lib advapi32.lib gdi32.lib
 
 AR := xlib.exe
-ARFLAGS = $(HB_USER_AFLAGS)
-AR_RULE = $(AR) $(ARFLAGS) /out:$(LIB_DIR)/$@ $(^F)
+ARFLAGS :=
+AR_RULE = $(AR) $(ARFLAGS) $(HB_USER_AFLAGS) /out:$(LIB_DIR)/$@ $(^F)
 
 include $(TOP)$(ROOT)config/rules.cf