Commit ff308f40 authored by eric@webkit.org's avatar eric@webkit.org

2010-05-29 Lucas De Marchi <lucas.demarchi@profusion.mobi>

        Reviewed by Darin Adler.

        Check if a CC environment variable is defined before hard-coding gcc's
        path. Simply hard-coding it breaks cross-compilation and Linux
        distributions with more than one gcc installed (or not in the default
        path).
        https://bugs.webkit.org/show_bug.cgi?id=35551

        No new functionality, so no new tests.

        * bindings/scripts/CodeGeneratorObjC.pm:
        * bindings/scripts/IDLParser.pm:
        * dom/make_names.pl:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@60413 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent dcd6a733
2010-05-29 Lucas De Marchi <lucas.demarchi@profusion.mobi>
Reviewed by Darin Adler.
Check if a CC environment variable is defined before hard-coding gcc's
path. Simply hard-coding it breaks cross-compilation and Linux
distributions with more than one gcc installed (or not in the default
path).
https://bugs.webkit.org/show_bug.cgi?id=35551
No new functionality, so no new tests.
* bindings/scripts/CodeGeneratorObjC.pm:
* bindings/scripts/IDLParser.pm:
* dom/make_names.pl:
2010-05-29 Pavel Feldman <pfeldman@chromium.org>
Reviewed by Timothy Hatcher.
......
......@@ -224,7 +224,9 @@ sub ReadPublicInterfaces
my $fileName = "WebCore/bindings/objc/PublicDOMInterfaces.h";
my $gccLocation = "";
if (($Config::Config{'osname'}) =~ /solaris/i) {
if ($ENV{CC}) {
$gccLocation = $ENV{CC};
} elsif (($Config::Config{'osname'}) =~ /solaris/i) {
$gccLocation = "/usr/sfw/bin/gcc";
} else {
$gccLocation = "/usr/bin/gcc";
......
......@@ -66,7 +66,9 @@ sub Parse
if (!$preprocessor) {
require Config;
my $gccLocation = "";
if (($Config::Config{'osname'}) =~ /solaris/i) {
if ($ENV{CC}) {
$gccLocation = $ENV{CC};
} elsif (($Config::Config{'osname'}) =~ /solaris/i) {
$gccLocation = "/usr/sfw/bin/gcc";
} else {
$gccLocation = "/usr/bin/gcc";
......
......@@ -49,7 +49,9 @@ my %parameters = ();
my $extraDefines = 0;
require Config;
my $gccLocation = "";
if (($Config::Config{'osname'}) =~ /solaris/i) {
if ($ENV{CC}) {
$gccLocation = $ENV{CC};
} elsif (($Config::Config{'osname'}) =~ /solaris/i) {
$gccLocation = "/usr/sfw/bin/gcc";
} else {
$gccLocation = "/usr/bin/gcc";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment