File tree Expand file tree Collapse file tree 2 files changed +12
-3
lines changed
Expand file tree Collapse file tree 2 files changed +12
-3
lines changed Original file line number Diff line number Diff line change @@ -4342,8 +4342,7 @@ AS_IF([test -n "${LIBS}"], [
43424342 MAINFLAGS=`echo " $MAINLIBS " | sed "s|$libspat"'||;s/^ *//;s/ *$//'`
43434343] )
43444344LIBRUBYARG_STATIC="${LIBRUBYARG_STATIC} \$(MAINLIBS)"
4345- CPPFLAGS="$CPPFLAGS "'$(DEFS)'
4346- test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}'
4345+ CPPFLAGS="$CPPFLAGS "'$(DEFS) ${cppflags}'
43474346AS_IF ( [ test -n "${cflags+set}"] , [
43484347 cflagspat=`eval echo '"'"${cflags}"'"' | sed 's/[ [ ] [ |.*] ] /\\&/g;s/^ */ /;s/^ *$/ /'`
43494348 CFLAGS=`echo " $CFLAGS " | sed "s|$cflagspat"'|${cflags}|;s/^ *//;s/ *$//'`
Original file line number Diff line number Diff line change @@ -514,7 +514,17 @@ _PREFIXED_SYMBOL = TOKEN_PASTE($(SYMBOL_PREFIX),name)
514514
515515.d.h :
516516 @$(ECHO ) translating probes $<
517- $(Q ) $(DTRACE ) -o $@ .tmp -h -C $(INCFLAGS ) $(CPPFLAGS ) -s $<
517+ $(Q ) $(DTRACE ) -o $@ .tmp -h -C $(INCFLAGS ) ` echo " $( CPPFLAGS) " | \
518+ sed -e " s/^/\n/" \
519+ -e " : loop" \
520+ -e " s/\n\(\('[^']*'\|[^ ']*\)*\)/\1\n/" \
521+ -e " /^\(-[DU]\|'-[DU]\).*/P" \
522+ -e " s/^..*\n/\n/" \
523+ -e " T" \
524+ -e " s/\n */\n/" \
525+ -e " t loop" \
526+ -e " s/.*//" \
527+ ` -s $<
518528 $(Q ) sed -e ' s/RUBY_/RUBY_DTRACE_/g' -e ' s/PROBES_H_TMP/RUBY_PROBES_H/' -e ' s/(char \*/(const char */g' -e ' s/, char \*/, const char */g' $@ .tmp > $@
519529 $(Q ) $(RM ) $@ .tmp
520530
You can’t perform that action at this time.
0 commit comments