Skip to content

Commit ba38c32

Browse files
Tor Didriksendahlerlend
authored andcommitted
Bug #30035089 CLANG-TIDY ON THE CMAKE CODEBASE [noclose]
Post-push fix for code to Limit memory used by javac, build of ndbcluster failed in 32bit mode. Change-Id: I041095a67c65d2c47ddb4097b75c245368206d62
1 parent ba2b532 commit ba38c32

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

storage/ndb/config/type_JAVA.cmake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,11 @@ MACRO(CREATE_JAR)
9595

9696
# Limit memory of javac, otherwise build might fail for parallel builds.
9797
# (out-of-memory/timeout if garbage collector kicks in too late)
98-
SET(JAVA_ARGS "-J-Xmx3G")
98+
IF(SIZEOF_VOIDP EQUAL 8)
99+
SET(JAVA_ARGS "-J-Xmx3G")
100+
ELSE()
101+
SET(JAVA_ARGS "-J-Xmx1G")
102+
ENDIF()
99103

100104
# Compile
101105
IF (JAVA_FILES)

0 commit comments

Comments
 (0)