diff --git a/build.xml b/build.xml index 966bf09d01db39150923abb78dade42353e9f468..edc241459a6098b09e9486a2bc0b152dbe732069 100644 --- a/build.xml +++ b/build.xml @@ -314,6 +314,7 @@ + diff --git a/src-disl-agent/Makefile b/src-disl-agent/Makefile index 2d13f9aca6bc48c39a15ea913215f2992448bb91..12c86be5d4d7b3ff9e187c3fae2b57875bc969d8 100644 --- a/src-disl-agent/Makefile +++ b/src-disl-agent/Makefile @@ -78,7 +78,7 @@ else ifeq (Linux,$(TARGET_ENV)) # CFLAGS_WHOLE := -flto -fwhole-program - ifneq (x86_64,$(TARGET_CPU)) + ifeq (,$(filter $(TARGET_CPU),x86_64 ppc64)) CFLAGS += -m32 LDFLAGS += -melf_i386 endif @@ -89,6 +89,8 @@ endif ifeq (x86_64,$(TARGET_CPU)) BUILD_DIR := $(JDK_TARGET)-x86_64 +else ifeq (ppc64,$(TARGET_CPU)) + BUILD_DIR := $(JDK_TARGET)-ppc64 else BUILD_DIR := $(JDK_TARGET)-x86 endif