提交 2f39dc94 编写于 作者: D dcubed

7043298: 4/4 fix for 7028172 causes "Label too long: ..." error message

Summary: Use '-e' version of sed expressions. Clarify and fix comments
Reviewed-by: never, acorn
上级 41f3a0a4
...@@ -57,24 +57,27 @@ SA_LFLAGS += -mt -xnolib -norunpath ...@@ -57,24 +57,27 @@ SA_LFLAGS += -mt -xnolib -norunpath
endif endif
# The libproc Pstack_iter() interface changed in Nevada-B159. # The libproc Pstack_iter() interface changed in Nevada-B159.
# This logic needs to match # Use 'uname -r -v' to determine the Solaris version as per
# Solaris Nevada team request. This logic needs to match:
# agent/src/os/solaris/proc/saproc.cpp: set_has_newer_Pstack_iter(): # agent/src/os/solaris/proc/saproc.cpp: set_has_newer_Pstack_iter():
# - skip SunOS 4 or older # - skip SunOS 4 or older
# - skip Solaris 10 or older # - skip Solaris 10 or older
# - skip two digit Nevada builds # - skip two digit internal Nevada builds
# - skip three digit Nevada builds thru 149 # - skip three digit internal Nevada builds thru 149
# - skip Nevada builds 150-158 # - skip internal Nevada builds 150-158
# - if not skipped, print define for Nevada-B159 or later
SOLARIS_11_B159_OR_LATER := \ SOLARIS_11_B159_OR_LATER := \
$(shell uname -r -v \ $(shell uname -r -v \
| sed -n ' \ | sed -n \
/^[0-3]\. /b \ -e '/^[0-4]\. /b' \
/^5\.[0-9] /b \ -e '/^5\.[0-9] /b' \
/^5\.10 /b \ -e '/^5\.10 /b' \
/ snv_[0-9][0-9]$/b \ -e '/ snv_[0-9][0-9]$/b' \
/ snv_[01][0-4][0-9]$/b \ -e '/ snv_[01][0-4][0-9]$/b' \
/ snv_15[0-8]$/b \ -e '/ snv_15[0-8]$/b' \
s/.*/-DSOLARIS_11_B159_OR_LATER/p \ -e 's/.*/-DSOLARIS_11_B159_OR_LATER/' \
') -e 'p' \
)
# Uncomment the following to simulate building on Nevada-B159 or later # Uncomment the following to simulate building on Nevada-B159 or later
# when actually building on Nevada-B158 or earlier: # when actually building on Nevada-B158 or earlier:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册