From e25390f469d642702391f53d8f4a0d178ee7aba5 Mon Sep 17 00:00:00 2001 From: shaobero Date: Thu, 10 Sep 2020 10:14:48 +0000 Subject: [PATCH] ICU-21272 Making changes in makedata.mak to fix Debug cross-build for ARM & ARM64 --- icu4c/source/data/makedata.mak | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/icu4c/source/data/makedata.mak b/icu4c/source/data/makedata.mak index b9a23231951..ef4e955fbf1 100644 --- a/icu4c/source/data/makedata.mak +++ b/icu4c/source/data/makedata.mak @@ -168,8 +168,13 @@ ARM_CROSSBUILD_TS=$(ICUTMP)\$(ARM_CROSS_BUILD).timestamp !IF "$(ARM_CROSS_BUILD)" == "" CFGTOOLS=$(CFG) !ELSE +!IF "$(CFG)" == "ARM\Release" || "$(CFG)" == "ARM64\Release" CFGTOOLS=x64\Release !ENDIF +!IF "$(CFG)" == "ARM\Debug" || "$(CFG)" == "ARM64\Debug" +CFGTOOLS=x64\Debug +!ENDIF +!ENDIF !MESSAGE ICU tools CFG subpath is $(CFGTOOLS)