Changeset 34255 for branches/eam_branches/ipp-20120627/psconfig

Timestamp:

Jul 31, 2012, 3:51:23 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120627

Files:

• . (modified) (1 prop)
• psconfig/psconfig.csh.in (modified) (2 diffs)
• psconfig/tagsets/ipp-3.0.dist (modified) (1 diff)

branches/eam_branches/ipp-20120627/psconfig/psconfig.csh.in

@@ -319 +319 @@
  case linux:
  case linrh:
-   gcc --version | grep 4.6.3 | grep Ubuntu >& /dev/null
+   gcc --version | grep -e 4.6 -e 4.5 | grep Ubuntu >& /dev/null
    if ($status == 0) then
     set xtraflags = "-Wl,--no-as-needed"
@@ -331 +331 @@
  case lin64:
  case linrh64:
-   gcc --version | grep 4.6.3 | grep Ubuntu >& /dev/null
+   gcc --version | grep -e 4.6 -e 4.5 | grep Ubuntu >& /dev/null
    if ($status == 0) then
     set xtraflags = "-Wl,--no-as-needed"

branches/eam_branches/ipp-20120627/psconfig/tagsets/ipp-3.0.dist

@@ -64 +64 @@
   YYYYY  ippScripts             ipp-2-9          -0
   YYYYY  ippTasks               ipp-2-9          -0
+# YYYYY  ippToPsps              ipp-2-9          -0
           
   YYYYY  ippconfig              ipp-2-9          -0