X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=cflags.SH;h=6c26025379a25aa4d2f480ebf88f87af00ffddb5;hb=fe2ae5081bc2e29bed890e921179e594deb788ec;hp=2aed681697ec21483bf10eeda40d1de2897c9a3d;hpb=b233458bd1d5037ce4bbbb41fb513e1b68522a4d;p=p5sagit%2Fp5-mst-13.2.git diff --git a/cflags.SH b/cflags.SH index 2aed681..6c26025 100755 --- a/cflags.SH +++ b/cflags.SH @@ -1,4 +1,4 @@ -case $CONFIGDOTSH in +case $PERL_CONFIG_SH in '') if test -f config.sh; then TOP=.; elif test -f ../config.sh; then TOP=..; @@ -24,12 +24,11 @@ echo "Extracting cflags (with variable substitutions)" rm -f cflags $spitshell >cflags <>cflags <<'!NO!SUBS!' -case $CONFIGDOTSH in +case $PERL_CONFIG_SH in '') if test -f config.sh; then TOP=.; elif test -f ../config.sh; then TOP=..; @@ -43,18 +42,14 @@ case $CONFIGDOTSH in ;; esac -perltype='' -optdebug='' # ensure -g used if building a -DDEBUGGING libperl -case $# in -2) case $1 in - *perl.*) perltype='';; - *perld.*) perltype='-DDEBUGGING'; optdebug='-g' ;; - *perle.*) perltype='-DEMBED';; - *perlde.*) perltype='-DDEBUGGING -DEMBED'; optdebug='-g' ;; - *perlm.*) perltype='-DEMBED -DMULTIPLICITY';; - *perldm.*) perltype='-DDEBUGGING -DEMBED -DMULTIPLICITY'; optdebug='-g' ;; - esac - shift ;; +: syntax: cflags [optimize=XXX] [file[.suffix]] +: displays the compiler command line for file + +case "X$1" in +Xoptimize=*|X"optimize=*") + eval "$1" + shift + ;; esac also=': ' @@ -75,12 +70,6 @@ for file do *) echo $n " $file.c $c" ;; esac - : allow for out-of-source experience - - if test "X$src" != X.; then - ccflags="$ccflags -I$src -I." - fi - : allow variables like toke_cflags to be evaluated if echo $file | grep -v / >/dev/null @@ -106,17 +95,21 @@ for file do dump) ;; gv) ;; hv) ;; + locale) ;; main) ;; malloc) ;; mg) ;; miniperlmain) ;; + numeric) ;; op) ;; perl) ;; + perlapi) ;; perlmain) ;; perly) ;; pp) ;; pp_ctl) ;; pp_hot) ;; + pp_pack) ;; pp_sys) ;; regcomp) ;; regexec) ;; @@ -130,13 +123,55 @@ for file do *) ;; esac - if test "X$optdebug" != "X"; then - optimize="$optdebug" - fi +# Add -Wall for the core modules iff gcc and not already -Wall +warn='' +case "$gccversion" in +'') ;; +Intel*) ;; +*) case "$ccflags" in + *-Wall*) ;; + *) warn="$warn -Wall" ;; + esac + case "$gccansipedantic" in + define) + case "$gccversion" in + [12]*) ;; # gcc versions 1 (gasp!) and 2 are not good for this. + *) case "$osname" in + # Add -ansi -pedantic only for known platforms. + aix|dec_osf|freebsd|hpux|irix|linux) + ansipedantic="-ansi -pedantic" ;; + solaris) +# Can't add -ansi for Solaris. +# Off_t/off_t is a struct in Solaris with largefiles, and with -ansi +# that struct cannot be compared with a flat integer, such as a STRLEN. +# The -ansi will also cause a lot of noise in Solaris because of: +# /usr/include/sys/resource.h:148: warning: `struct rlimit64' declared inside parameter list + ansipedantic="-pedantic" ;; + esac + for i in $ansipedantic + do + case "$ccflags" in + *$i*) ;; + *) warn="$warn $i" ;; + esac + done + case "$warn$ccflags" in + *-pedantic*) warn="$warn -DPERL_GCC_PEDANTIC" ;; + esac + ;; + esac + ;; + esac + ;; +esac + +if test -f .patch; then + ccflags="-DPERL_PATCHNUM=`cat .patch` $ccflags" +fi : Can we perhaps use $ansi2knr here - echo "$cc -c -DPERL_CORE $ccflags $optimize $perltype $large $split" - eval "$also "'"$cc -DPERL_CORE -c $ccflags $optimize $perltype $large $split"' + echo "$cc -c -DPERL_CORE $ccflags $optimize $warn" + eval "$also "'"$cc -DPERL_CORE -c $ccflags $optimize $warn"' . $TOP/config.sh