2023-11-11 16:37 UTC+0100 Phil Krylov (phil a t krylov.eu)

* config/win/bcc.mk ! Fixed quoting when building under POSIX shell.
harbour · Nov 11, 2023 · 20483d4 · 20483d4
1 parent 38c080a
commit 20483d4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -7,6 +7,10 @@
    Entries may not always be in chronological/commit order.
    See license at the end of file. */
 
+2023-11-11 16:37 UTC+0100 Phil Krylov (phil a t krylov.eu)
+  * config/win/bcc.mk
+    ! Fixed quoting when building under POSIX shell.
+
 2023-11-11 16:00 UTC+0100 Phil Krylov (phil a t krylov.eu)
   * .github/workflows/linux-ci.yml
   * .github/workflows/macos-ci.yml

diff --git a/config/win/bcc.mk b/config/win/bcc.mk
@@ -106,7 +106,13 @@ else
    AR := tlib.exe
 endif
 ARFLAGS += /P128
-AR_RULE = $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) "$(subst /,$(BACKSLASH),$(LIB_DIR)/$@)" $(foreach file,$(?F),-+$(file))
+
+ifeq ($(HB_SHELL),sh)
+   q = '
+else
+   q = "
+endif
+AR_RULE = $(AR) $(ARFLAGS) $(HB_AFLAGS) $(HB_USER_AFLAGS) $(q)$(subst /,$(BACKSLASH),$(LIB_DIR)/$@)$(q) $(foreach file,$(?F),-+$(file))
 
 ifneq ($(HB_SHELL),sh)
    ifeq ($(HB_SHELL_XP),)