mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-27 10:55:33 +02:00
Code Issues Wiki Activity

Bug 407580: Can't build project with GnuMakefile using Autotools plug-in

Browse source 
- Remove trailing separator from PWD during configuration step

Change-Id: Ideddd1ce9b9d0a5a90219a411c114315046a7c8d
Reviewed-on: https://git.eclipse.org/r/12657
Reviewed-by: Jeff Johnston <jjohnstn@redhat.com>
IP-Clean: Jeff Johnston <jjohnstn@redhat.com>
Tested-by: Jeff Johnston <jjohnstn@redhat.com>
This commit is contained in:
Jeff Johnston 2013-05-08 16:26:20 -04:00
parent 9a4a52cc00
commit 143d87d88c
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
build/org.eclipse.cdt.autotools.core/src/org/eclipse/cdt/internal/autotools/core/AutotoolsNewMakeGenerator.java
View file

@ -1152,9 +1152,20 @@ public class AutotoolsNewMakeGenerator extends MarkerGenerator {
// For Windows/Mac, check for PWD environment variable being passed. // For Windows/Mac, check for PWD environment variable being passed.
// Remove it for now as it is causing errors in configuration. // Remove it for now as it is causing errors in configuration.
// Fix for bug #343879 // Fix for bug #343879
if (!removePWD || !variables[i].getName().equals("PWD")) // $NON-NLS-1$ if (!removePWD || !variables[i].getName().equals("PWD")) { // $NON-NLS-1$
String value = variables[i].getValue();
// The following is a work-around for bug #407580. Configure doesn't recognize
// a directory with a trailing separator at the end is equivalent to the same
// directory without that trailing separator. This problem can cause
// configure to try and link a file to itself (e.g. projects with a GnuMakefile) and
// obliterate the contents. Thus, we remove the trailing separator to be safe.
if (variables[i].getName().equals("PWD")) { // $NON-NLS-1$
if (value.charAt(value.length()-1) == IPath.SEPARATOR)
value = value.substring(0, value.length() - 1);
}
envList.add(variables[i].getName() envList.add(variables[i].getName()
+ "=" + variables[i].getValue()); //$NON-NLS-1$ + "=" + value); //$NON-NLS-1$
}
} }
if (additionalEnvs != null) if (additionalEnvs != null)
envList.addAll(additionalEnvs); // add any additional environment variables specified ahead of script envList.addAll(additionalEnvs); // add any additional environment variables specified ahead of script