summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2019-10-23 02:53:36 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2019-10-23 02:53:36 +0900
commit46f175ed5c8560b3c9da5ab7b4fa73287f1eb1c5 (patch)
tree5a6e249e97303237a937b4de4d2abc05e2889732
parentd5d58447444109a75ceb86e239827f001da6214d (diff)
Use cppflags to pass preprocessor options
-rw-r--r--.travis.yml4
-rw-r--r--vm_opts.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index 3d3452b82d..0ca6cb53a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -159,7 +159,7 @@ env:
<<: *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:
<<: *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 d4e2ed786e..3df9ce837b 100644
--- a/vm_opts.h
+++ b/vm_opts.h
@@ -61,7 +61,9 @@
#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