From 20483d43ae8661aaf838c6f01aa282574ce699a0 Mon Sep 17 00:00:00 2001 From: Phil Krylov Date: Sat, 11 Nov 2023 16:37:45 +0100 Subject: [PATCH] 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. --- ChangeLog.txt | 4 ++++ config/win/bcc.mk | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 8bc3f40ee9..82ecb9fcfb 100644 --- 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 index 955827ec0c..d878b43d72 100644 --- 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),)