This is an automated email from the ASF dual-hosted git repository.
rainerjung pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git
The following commit(s) were added to refs/heads/main by this push:
new 816d66447 Drop BUILD_CPU, CPU is enough
816d66447 is described below
commit 816d66447246dfd9070835edfaa70d9c73aa63c9
Author: Rainer Jung <[email protected]>
AuthorDate: Thu Jun 25 02:36:08 2026 +0200
Drop BUILD_CPU, CPU is enough
---
native/common/NMAKEmakefile.inc | 9 ---------
native/iis/Makefile.vc | 2 +-
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/native/common/NMAKEmakefile.inc b/native/common/NMAKEmakefile.inc
index 3b10a8099..a64bd3774 100644
--- a/native/common/NMAKEmakefile.inc
+++ b/native/common/NMAKEmakefile.inc
@@ -92,15 +92,6 @@ MT = mt.exe
LINK_WRAPPER = $(LINK)
-# Use BUILD_CPU if CPU was not set
-!IF !DEFINED(CPU) || "$(CPU)" == ""
-!IF "$(BUILD_CPU)" == "i386" || "$(BUILD_CPU)" == "x86" || "$(BUILD_CPU)" ==
"i686"
-CPU=X86
-!ENDIF
-!IF "$(BUILD_CPU)" == "amd64" || "$(BUILD_CPU)" == "x86_64" || "$(BUILD_CPU)"
== "x64"
-CPU=X64
-!ENDIF
-!ENDIF
# Figure out CPU from the current host
!IF !DEFINED(CPU) || "$(CPU)" == ""
!IF "$(PROCESSOR_ARCHITECTURE)" == ""
diff --git a/native/iis/Makefile.vc b/native/iis/Makefile.vc
index 85c56d765..1a9ff3e86 100644
--- a/native/iis/Makefile.vc
+++ b/native/iis/Makefile.vc
@@ -63,7 +63,7 @@ $(WORKDIR) :
libpcre:
@cd .\$(PCRE)
- @$(MAKE) -f Makefile.vc NMAKE_WINVER=$(NMAKE_WINVER)
BUILD_CPU=$(BUILD_CPU) CPU_CFLAGS="$(CPU_CFLAGS)"
+ @$(MAKE) -f Makefile.vc WINVER=$(WINVER) CPU=$(CPU)
@cd ..
.c{$(WORKDIR)}.obj:
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
