Attachment 292442 Details for Bug 429641 – patch

[patch] patch

test-sysroot.patch (text/plain), 1.42 KB, created by Stan Cox on 2008-01-22 02:44:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stan Cox

Created: 2008-01-22 02:44:26 UTC

Size: 1.42 KB

patch

obsolete

>diff --git a/frysk-core/frysk/debuginfo/ChangeLog b/frysk-core/frysk/debuginfo/ChangeLog
>index 3ea01bc..c9da568 100644
>--- a/frysk-core/frysk/debuginfo/ChangeLog
>+++ b/frysk-core/frysk/debuginfo/ChangeLog
>@@ -1,3 +1,7 @@
>+2008-01-21  Stan Cox  <scox@redhat.com>
>+
>+	* DebugInfoFrame.java (getLine):  Do not consider SYSROOT.
>+
> 2008-01-18  Mark Wielaard  <mwielaard@redhat.com>
> 
> 	* CompilerVersionFactory.java: Add copyright boilerplate.
>diff --git a/frysk-core/frysk/debuginfo/DebugInfoFrame.java b/frysk-core/frysk/debuginfo/DebugInfoFrame.java
>index f1d8682..8f2229e 100644
>--- a/frysk-core/frysk/debuginfo/DebugInfoFrame.java
>+++ b/frysk-core/frysk/debuginfo/DebugInfoFrame.java
>@@ -48,7 +48,6 @@ import lib.dwfl.Dwfl;
> import lib.dwfl.DwflDieBias;
> import lib.dwfl.DwflLine;
> import frysk.dwfl.DwflCache;
>-import frysk.hpd.DbgVariables;
> import frysk.rt.LineXXX;
> import frysk.scopes.SourceLocation;
> import frysk.scopes.Scope;
>@@ -184,13 +183,6 @@ public class DebugInfoFrame extends FrameDecorator {
>   		    File parent = new File(dwflLine.getCompilationDir());
>   		    f = new File(parent, dwflLine.getSourceFile());
> 		}
>-		else {
>-		    String sysroot = DbgVariables.getStringValue("SYSROOT");
>-		    if (sysroot.length() > 0) {
>-			File parent = new File(sysroot);
>-			f = new File(parent, dwflLine.getSourceFile());
>-		    }
>-		}
>   		this.line = new SourceLocation(f, dwflLine.getLineNum(),
> 				     dwflLine.getColumn());
> 	    }

Actions: View | Diff

Attachments on bug 429641: 292442 | 292443 | 292549