mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-06-05 08:46:02 +02:00
Autotools Sync - Fix an issue when trying to build Syncro Autotools project.
As the RemoteCommandLauncher#makeRemote already convert the local path to a remote path, dont need to convert it here, otherwise it will mess with the configure path. Change-Id: Ibaaeb34dc80f1574f8b59db0ad0d68cf49af2551 Signed-off-by: Roberto Oliveira <rdutra@linux.vnet.ibm.com> Reviewed-on: https://git.eclipse.org/r/33574 Reviewed-by: Greg Watson <g.watson@computer.org> Reviewed-by: Wainer dos Santos Moschetta <wainersm@linux.vnet.ibm.com> Tested-by: Hudson CI Reviewed-by: Jeff Johnston <jjohnstn@redhat.com> Tested-by: Jeff Johnston <jjohnstn@redhat.com>
This commit is contained in:
parent
8015431bf1
commit
fd8148a659
1 changed files with 1 additions and 14 deletions
|
@ -1031,15 +1031,6 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Method to translate paths to various commands to their remote counter-parts
|
|
||||||
private IPath getRemotePath(IPath path) {
|
|
||||||
IRemoteResource remRes = (IRemoteResource) getProject().getAdapter(IRemoteResource.class);
|
|
||||||
if (remRes != null) {
|
|
||||||
return RemoteCommandLauncher.makeRemote(path, remRes);
|
|
||||||
}
|
|
||||||
return path;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Method to get the Win OS Type to distinguish between Cygwin and MingW
|
// Method to get the Win OS Type to distinguish between Cygwin and MingW
|
||||||
private String getWinOSType() {
|
private String getWinOSType() {
|
||||||
if (winOSType.equals("")) {
|
if (winOSType.equals("")) {
|
||||||
|
@ -1137,11 +1128,7 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
|
||||||
boolean removePWD = false;
|
boolean removePWD = false;
|
||||||
|
|
||||||
removeAllMarkers(project);
|
removeAllMarkers(project);
|
||||||
|
|
||||||
// Convert the command path if we have an absolute path and we are executing this remotely
|
|
||||||
if (commandPath.isAbsolute())
|
|
||||||
commandPath = getRemotePath(commandPath);
|
|
||||||
|
|
||||||
// We want to run the script via the shell command. So, we add the command
|
// We want to run the script via the shell command. So, we add the command
|
||||||
// script as the first argument and expect "sh" to be on the runtime path.
|
// script as the first argument and expect "sh" to be on the runtime path.
|
||||||
// Any other arguments are placed after the script name.
|
// Any other arguments are placed after the script name.
|
||||||
|
|
Loading…
Add table
Reference in a new issue