diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-12-18 17:56:20 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-12-18 18:03:49 +0100 |
| commit | 1bffa142c530b638e245e1aca58a27414d65e927 (patch) | |
| tree | 6b6be62ed9c7d4bd4709a026f754f59e9c5ab3aa /odk/config/configure.pl | |
| parent | 6e06bd6cb5199b5164975eff97dd22b0a69829e5 (diff) | |
fdo#72598: odk: remove SunStudio support
No idea if the GCC stuff that's in there actually works.
Change-Id: Idd1b93edd88609f3c09d14134d00a15fa9c0b0b7
Diffstat (limited to 'odk/config/configure.pl')
| -rwxr-xr-x | odk/config/configure.pl | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/odk/config/configure.pl b/odk/config/configure.pl index 588f80bf45ef..dde3a94cf773 100755 --- a/odk/config/configure.pl +++ b/odk/config/configure.pl @@ -77,12 +77,6 @@ $main::OO_SDK_SED_HOME_SUGGESTION = searchprog("sed"); $main::OO_SDK_CPP_HOME = ""; $main::cppName = "gcc"; $main::cppVersion = "4.0.1"; -if ( $main::operatingSystem =~ m/solaris/ ) -{ - $main::cppName = "CC"; - $main::cppVersion = "5.2"; -} -$main::OO_SDK_CC_55_OR_HIGHER = ""; $main::OO_SDK_CPP_HOME_SUGGESTION = searchprog($main::cppName); $main::OO_SDK_JAVA_HOME = ""; @@ -420,39 +414,6 @@ while ( (!$main::correctVersion) && $main::OO_SDK_CPP_HOME = ""; } } - } else - { - # for Solaris we have to check the version too - open(FILE, "$OO_SDK_CPP_HOME/$main::cppName -V 2>&1 |"); - my @lines = <FILE>; - my $testVersion = $lines[0]; - if ( $testVersion eq "") - { - print " The '$main::cppName' command found at $main::OO_SDK_CPP_HOME/$main::cppName is not a "; - print " Solaris C++ compiler.\nSet the environment variable OO_SDK_CPP_HOME to your Solaris C++ compiler directory.\n"; - } else - { - if ($testVersion =~ m#((\d+\.)+\d+)# ) - { - $testVersion = $1; - } - $main::correctVersion = testVersion($main::cppVersion, $testVersion, "$main::OO_SDK_CPP_HOME/$main::cppName", 1); - if ( !$main::correctVersion ) - { - print " The '$main::cppName' command found at '$main::OO_SDK_CPP_HOME' has a wrong version\n"; - if ( skipChoice("C++ compiler") == 1 ) - { - $main::correctVersion = 1; - } - - $main::OO_SDK_CPP_HOME = ""; - } else { - $main::correctVersion = testVersion("5.5", $testVersion, "$main::OO_SDK_CPP_HOME/$main::cppName", 2); - if ( $main::correctVersion ) { - $main::OO_SDK_CC_55_OR_HIGHER = $testVersion; - } - } - } } } } else @@ -857,7 +818,6 @@ sub prepareScriptFile() $_ =~ s#\@OO_SDK_CAT_HOME\@#$main::OO_SDK_CAT_HOME#go; $_ =~ s#\@OO_SDK_SED_HOME\@#$main::OO_SDK_SED_HOME#go; $_ =~ s#\@OO_SDK_CPP_HOME\@#$main::OO_SDK_CPP_HOME#go; - $_ =~ s#\@OO_SDK_CC_55_OR_HIGHER\@#$main::OO_SDK_CC_55_OR_HIGHER#go; $_ =~ s#\@OO_SDK_JAVA_HOME\@#$main::OO_SDK_JAVA_HOME#go; $_ =~ s#\@SDK_AUTO_DEPLOYMENT\@#$main::SDK_AUTO_DEPLOYMENT#go; $_ =~ s#\@OO_SDK_OUTPUT_DIR\@#$main::OO_SDK_OUTPUT_DIR#go; |