Skip to content

Commit 738ba03

Browse files
author
kalibera
committed
Handle whitespace.
git-svn-id: https://svn.r-project.org/R/trunk@87890 00db46b3-68df-0310-9c12-caf00c1e9a41
1 parent 6a283a5 commit 738ba03

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/gnuwin32/installer/Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,18 +40,18 @@ SHARE_DIRS = R dictionaries encodings licenses make Rd texmf zoneinfo
4040
all: $(RPREFIX)-win.exe
4141
msi: $(RPREFIX)-$(SUFF).msi
4242

43-
RBUILD := $(if $(findstring Aarch64,\
44-
$(subst ARM64,Aarch64,$(shell file "$(R_HOME)/bin/R.exe"))),\
45-
aarch64,x86_64)
43+
RBUILD := $(strip $(if $(findstring Aarch64,\
44+
$(subst ARM64,Aarch64,$(shell file "$(R_HOME)/bin/R.exe"))),\
45+
aarch64,x86_64))
4646

4747
ifeq ($(CROSS_BUILD),)
4848
RTARGET := $(RBUILD)
4949
R_ARCH_TARGET := $(R_ARCH)
5050
else
5151
R_HOME_CROSS = $(CROSS_BUILD)
52-
RTARGET := $(if $(findstring Aarch64,\
53-
$(subst ARM64,Aarch64,$(shell file "$(R_HOME_CROSS)/bin/R.exe"))),\
54-
aarch64,x86_64)
52+
RTARGET := $(strip $(if $(findstring Aarch64,\
53+
$(subst ARM64,Aarch64,$(shell file "$(R_HOME_CROSS)/bin/R.exe"))),\
54+
aarch64,x86_64))
5555
R_ARCH_TARGET := $(shell $(FIND) $(R_HOME_CROSS)/bin -name $R.dll | $(SED) -e 's!.*/bin\(.*\)/R.dll!\1!g')
5656
endif
5757

0 commit comments

Comments
 (0)