Skip to content

Commit 6e42349

Browse files
committed
[Bug #21862] Extract -D/-U options only for dtrace
A workaround for rubyGH-12563#issuecomment-3691590489.
1 parent 26b81be commit 6e42349

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

configure.ac

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4342,8 +4342,7 @@ AS_IF([test -n "${LIBS}"], [
43424342
MAINFLAGS=`echo " $MAINLIBS " | sed "s|$libspat"'||;s/^ *//;s/ *$//'`
43434343
])
43444344
LIBRUBYARG_STATIC="${LIBRUBYARG_STATIC} \$(MAINLIBS)"
4345-
CPPFLAGS="$CPPFLAGS "'$(DEFS)'
4346-
test -z "$CPPFLAGS" || CPPFLAGS="$CPPFLAGS "; CPPFLAGS="$CPPFLAGS"'${cppflags}'
4345+
CPPFLAGS="$CPPFLAGS "'$(DEFS) ${cppflags}'
43474346
AS_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/ *$//'`

template/Makefile.in

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff 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

0 commit comments

Comments
 (0)