diff options
| -rw-r--r-- | Makefile.SH | 14 | ||||
| -rwxr-xr-x | cflags.SH | 25 |
2 files changed, 7 insertions, 32 deletions
diff --git a/Makefile.SH b/Makefile.SH index 8cf8bd8582..2759114ddb 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -261,9 +261,9 @@ esac ## In the following dollars and backticks do not need the extra backslash. $spitshell >>Makefile <<'!NO!SUBS!' -CCCMD = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $(LIBPERL) $@` +CCCMD = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $@` -CCCMDSRC = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $(LIBPERL) $<` +CCCMDSRC = `sh $(shellflags) cflags "optimize='$(OPTIMIZE)'" $<` private = preplibrary lib/Config.pm lib/ExtUtils/Miniperl.pm @@ -309,16 +309,6 @@ obj3 = doop$(OBJ_EXT) doio$(OBJ_EXT) regexec$(OBJ_EXT) utf8$(OBJ_EXT) taint$(OBJ obj = $(obj1) $(obj2) $(obj3) $(ARCHOBJS) -# Once perl has been Configure'd and built ok you build different -# perl variants (Debugging, Embedded, Multiplicity etc) by saying: -# make clean; make LIBPERL=libperl<type>.a -# where <type> is some combination of 'd' and(or) 'e' or 'm'. -# See cflags to understand how this works. -# -# This mechanism is getting clunky and might not even work any more. -# EMBEDDING is on by default, and MULTIPLICITY doesn't work. -# - lintflags = -hbvxac .c$(OBJ_EXT): @@ -42,6 +42,9 @@ case $PERL_CONFIG_SH in ;; esac +: syntax: cflags [optimize=XXX] [file[.suffix]] +: displays the compiler command line for file + case "X$1" in Xoptimize=*|X"optimize=*") eval "$1" @@ -49,20 +52,6 @@ Xoptimize=*|X"optimize=*") ;; 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 ;; -esac - also=': ' case $# in 1) also='echo 1>&2 " CCCMD = "' @@ -134,10 +123,6 @@ for file do *) ;; esac - if test "X$optdebug" != "X"; then - optimize="$optdebug $optimize" - fi - # Add -Wall for the core and core modules iff gcc and not already -Wall warn='' case "$gccversion" in @@ -155,8 +140,8 @@ case "$gccversion" in esac : Can we perhaps use $ansi2knr here - echo "$cc -c -DPERL_CORE $ccflags $optimize $warn $perltype" - eval "$also "'"$cc -DPERL_CORE -c $ccflags $optimize $warn $perltype"' + echo "$cc -c -DPERL_CORE $ccflags $optimize $warn" + eval "$also "'"$cc -DPERL_CORE -c $ccflags $optimize $warn"' . $TOP/config.sh |