https://git.ruby-lang.org/ruby.git/commit/?id=46f175ed5c

From 46f175ed5c8560b3c9da5ab7b4fa73287f1eb1c5 Mon Sep 17 00:00:00 2001
From: Nobuyoshi Nakada <nobu@r...>
Date: Wed, 23 Oct 2019 02:53:36 +0900
Subject: Use cppflags to pass preprocessor options


diff --git a/.travis.yml b/.travis.yml
index 3d3452b..0ca6cb5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -159,7 +159,7 @@ env: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L159
     <<: *cron-only
     <<: *make-test-only
     env:
-      - BEFORE_INSTALL="sed vm_opts.h -e 's/OPT_SUPPORT_JOKE *0/OPT_SUPPORT_JOKE 1/' -i"
+      - cppflags=-DOPT_SUPPORT_JOKE
 
   - &CPDEBUG
     name: CPDEBUG
@@ -167,7 +167,7 @@ env: https://github.com/ruby/ruby/blob/trunk/.travis.yml#L167
     <<: *cron-only
     <<: *make-test-only
     env:
-      - DEFS="-DCPDEBUG"
+      - cppflags=-DCPDEBUG
 
   - &WITH_COROUTINE_UCONTEXT
     name: COROUTINE=ucontext
diff --git a/vm_opts.h b/vm_opts.h
index d4e2ed7..3df9ce8 100644
--- a/vm_opts.h
+++ b/vm_opts.h
@@ -61,7 +61,9 @@ https://github.com/ruby/ruby/blob/trunk/vm_opts.h#L61
 #define OPT_STACK_CACHING            0
 
 /* misc */
+#ifndef OPT_SUPPORT_JOKE
 #define OPT_SUPPORT_JOKE             0
+#endif
 
 #ifndef VM_COLLECT_USAGE_DETAILS
 #define VM_COLLECT_USAGE_DETAILS     0
-- 
cgit v0.10.2


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/