9c, 9l: accept CC9FLAGS from config
Also, if CC9FLAGS includes -fsanitize=address (ASAN), predefine PLAN9PORT_ASAN for use by programs that need to know (mainly libthread). The 9c script used to have a variable called ngflags, which was ccflags except -g (ng stood for "no g"), but nothing needs it split out anymore, so simplify to just ccflags.
This commit is contained in:
parent
154140a22b
commit
9444b8e4bc
3 changed files with 39 additions and 18 deletions
14
bin/9l
14
bin/9l
|
|
@ -12,29 +12,29 @@ extralibs="-lm"
|
|||
tag="${SYSNAME:-`uname`}-${OBJTYPE:-`uname -m`}"
|
||||
case "$tag" in
|
||||
*DragonFly*|*BSD*)
|
||||
ld=${CC9:-gcc}
|
||||
ld="${CC9:-gcc} $CC9FLAGS"
|
||||
userpath=true
|
||||
extralibs="$extralibs -lutil"
|
||||
;;
|
||||
*OSF1*)
|
||||
ld=${CC9:-cc}
|
||||
ld="${CC9:-cc} $CC9FLAGS"
|
||||
userpath=true
|
||||
extralibs="$extralibs -lutil"
|
||||
nmflags="-B"
|
||||
;;
|
||||
*Linux*)
|
||||
ld=${CC9:-gcc}
|
||||
ld="${CC9:-gcc} $CC9FLAGS"
|
||||
userpath=true
|
||||
extralibs="$extralibs -lutil -lresolv -lpthread"
|
||||
;;
|
||||
*Darwin*x86_64*)
|
||||
ld="${CC9:-gcc} -m64"
|
||||
ld="${CC9:-gcc} -m64 $CC9FLAGS"
|
||||
;;
|
||||
*Darwin*)
|
||||
ld="${CC9:-gcc} -m32"
|
||||
ld="${CC9:-gcc} -m32 $CC9FLAGS"
|
||||
;;
|
||||
*SunOS*)
|
||||
ld="${CC9:-cc} -g"
|
||||
ld="${CC9:-cc} -g $CC9FLAGS"
|
||||
extralibs="$extralibs -lrt -lpthread -lsocket -lnsl"
|
||||
# Record paths to shared libraries to avoid needing LD_LIBRARY_PATH
|
||||
for i in "$libsl $@"
|
||||
|
|
@ -61,7 +61,7 @@ case "$tag" in
|
|||
esac
|
||||
;;
|
||||
*AIX*)
|
||||
ld="${CC9:-xlc_r} -g -O0"
|
||||
ld="${CC9:-xlc_r} -g -O0 $CC9FLAGS"
|
||||
nmflags="-A -B"
|
||||
extralibs="$extralibs -lpthread"
|
||||
;;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue