Changeset 40054 for trunk/psconfig

Timestamp:

May 21, 2017, 3:08:01 PM (9 years ago)

Author:

eugene

Message:

fix awk parsing for gcc

File:

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

trunk/psconfig/psconfig.csh.in

@@ -329 +329 @@
    # 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
+   # gcc --version | awk '{split($0,value,/\(.+\)/)}(NR == 1){print value[2]}'
+   # gcc --version | awk '{split($0,value,/\(.+\)/)}(NR == 1){print value[2]}' | awk -F. '{printf "%s.%s\n", $1, $2}'
+   # gcc --version | awk '{split($0,value,/\(.+\)/)}(NR == 1){print value[2]}' | awk -F. '{printf "%s.%s\n", $1, $2}' | awk '{n=0}($1 >= 4.5){n=1}{print n}'
+   set use_no_as_needed = `gcc --version | awk '{split($0,value,/\(.+\)/)}(NR == 1){print value[2]}' | awk -F. '{printf "%s.%s\n", $1, $2}' | awk '{n=0}($1 >= 4.5){n=1}{print n}'`
+   if ($use_no_as_needed == 1) then
     set xtraflags = "-Wl,--no-as-needed"
     echo $LDFLAGS | grep -- $xtraflags >& /dev/null
@@ -347 +350 @@
    # 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
+   # gcc --version | awk '{split($0,value,/\(.+\)/)}(NR == 1){print value[2]}'
+   # gcc --version | awk '{split($0,value,/\(.+\)/)}(NR == 1){print value[2]}' | awk -F. '{printf "%s.%s\n", $1, $2}'
+   # gcc --version | awk '{split($0,value,/\(.+\)/)}(NR == 1){print value[2]}' | awk -F. '{printf "%s.%s\n", $1, $2}' | awk '{n=0}($1 >= 4.5){n=1}{print n}'
+   set use_no_as_needed = `gcc --version | awk '{split($0,value,/\(.+\)/)}(NR == 1){print value[2]}' | awk -F. '{printf "%s.%s\n", $1, $2}' | awk '{n=0}($1 >= 4.5){n=1}{print n}'`
+   if ($use_no_as_needed == 1) then
     set xtraflags = "-Wl,--no-as-needed"
     echo $LDFLAGS | grep -- $xtraflags >& /dev/null