LIBARCHNAME in CompileLauncher.gmk

Jeremy Manson jeremymanson at google.com
Fri Nov 15 19:46:49 UTC 2013


LIBARCHNAME as defined in CompileLauncher.gmk seems to be i586 in 32-bit
x86 instead of being i386.  It's using the wrong make variable.

LIBARCHNAME doesn't happen to be used in any of the launchers, so it hasn't
caused a problem, but it should probably be either fixed or removed.
 Here's a patch to fix it (I'm biased towards this, because our launcher
changes use it, but I could certainly understand going the other way).

diff --git a/makefiles/CompileLaunchers.gmk b/makefiles/CompileLaunchers.gmk
--- a/makefiles/CompileLaunchers.gmk
+++ b/makefiles/CompileLaunchers.gmk
@@ -144,7 +144,7 @@
           -DFULL_VERSION='"$(FULL_VERSION)"' \
           -DJDK_MAJOR_VERSION='"$(JDK_MAJOR_VERSION)"' \
           -DJDK_MINOR_VERSION='"$(JDK_MINOR_VERSION)"' \
-          -DLIBARCHNAME='"$(OPENJDK_TARGET_CPU_LEGACY)"' \
+          -DLIBARCHNAME='"$(OPENJDK_TARGET_CPU_LEGACY_LIB)"' \
           -DLAUNCHER_NAME='"$(LAUNCHER_NAME)"' \
           -DPROGNAME='"$1"' $(DPACKAGEPATH) \
           $2, \

Jeremy



More information about the build-dev mailing list