Changeset 40051

Timestamp:

May 18, 2017, 4:32:22 PM (9 years ago)

Author:

eugene

Message:

add more general test to gcc for version needed no-as-needed flag

File:

• trunk/psconfig/psconfig.csh.in (modified) (2 diffs)

trunk/psconfig/psconfig.csh.in

@@ -323 +323 @@
  case linux:
  case linrh:
-   gcc --version | grep -e 5.4 -e 4.8 -e 4.6 -e 4.5| grep Ubuntu >& /dev/null
-   if ($status == 0) then
+   # old test to see if we need no-as-needed
+   # gcc --version | grep -e 4.8 -e 4.6 -e 4.5 | grep Ubuntu >& /dev/null
+
+   # check that we need to add --no-as-needed (gcc version >= 4.5)
+   # https://lists.ubuntu.com/archives/ubuntu-devel-announce/2010-October/000772.html
+   # https://lists.ubuntu.com/archives/ubuntu-devel-announce/2010-November/000783.html
+   set use_no_as_needed = `gcc --version | awk '(NR == 1){print $NF}' | awk -F. '{printf "%s.%s\n", $1, $2}' | awk '{n=0}($1 >= 4.5){n=1}{print n}'`
+   if ($use_no_as_needed == 0) then
     set xtraflags = "-Wl,--no-as-needed"
     echo $LDFLAGS | grep -- $xtraflags >& /dev/null
@@ -335 +341 @@
  case lin64:
  case linrh64:
-   gcc --version | grep -e 5.4 -e 4.8 -e 4.6 -e 4.5 | grep Ubuntu >& /dev/null
-   if ($status == 0) then
+   # old test to see if we need no-as-needed
+   # gcc --version | grep -e 4.8 -e 4.6 -e 4.5 | grep Ubuntu >& /dev/null
+
+   # check that we need to add --no-as-needed (gcc version >= 4.5)
+   # https://lists.ubuntu.com/archives/ubuntu-devel-announce/2010-October/000772.html
+   # https://lists.ubuntu.com/archives/ubuntu-devel-announce/2010-November/000783.html
+   set use_no_as_needed = `gcc --version | awk '(NR == 1){print $NF}' | awk -F. '{printf "%s.%s\n", $1, $2}' | awk '{n=0}($1 >= 4.5){n=1}{print n}'`
+   if ($use_no_as_needed == 0) then
     set xtraflags = "-Wl,--no-as-needed"
     echo $LDFLAGS | grep -- $xtraflags >& /dev/null