Skip rebase targets generation

Signed-off-by: Violeta Sebe <[email protected]>
ncough · Oct 16, 2017 · ba11ff6 · ba11ff6
1 parent b36b200
commit ba11ff6
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformWindows.java b/sourcetools/com.ibm.uma/com/ibm/j9/uma/platform/PlatformWindows.java
@@ -548,12 +548,23 @@ void writeSharedLibResourceFile(Artifact artifact) throws UMAException {
 	@Override
 	public void writeTopLevelTargets(StringBuffer buffer) throws UMAException {
 		super.writeTopLevelTargets(buffer);
-		try {
-			// Add the rebase targets
-			writeRebaseTargets(buffer);
-			writeTweakedPhaseTargets(buffer);
-		} catch (IOException e) {
-			throw new UMAException(e);
+
+		if ( configuration.isFlagSet("build_openj9") ) {
+			// No rebase in openj9 builds
+			// ReBase.exe has been removed since Windows SDK 8. It could be replaced with "editbin /REBASE":
+			//	e.g.
+			//		editbin /REBASE:BASE=0x7FFFF750000,DOWN /DYNAMICBASE:NO /NOLOGO <list of *.ddl files>
+			buffer.append("\n");
+			buffer.append("export UMA_SINGLE_REBASE=1\n");
+			buffer.append("\n\n");
+		} else {
+			try {
+				// Add the rebase targets
+				writeRebaseTargets(buffer);
+				writeTweakedPhaseTargets(buffer);
+			} catch (IOException e) {
+				throw new UMAException(e);
+			}
 		}
 	}