This is an automated email from the ASF dual-hosted git repository. dinglei pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/rocketmq-ons-cpp.git
commit 1dde7ee99d91b05bac38727229ee04bcd3c98e54 Author: ShannonDing <[email protected]> AuthorDate: Wed Jul 24 20:45:52 2019 +0800 Support Dual ABI set --- src/main/java/org/apache/rocketmq/graalvm/CInterface.java | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/apache/rocketmq/graalvm/CInterface.java b/src/main/java/org/apache/rocketmq/graalvm/CInterface.java index f0a7ca7..abd433f 100644 --- a/src/main/java/org/apache/rocketmq/graalvm/CInterface.java +++ b/src/main/java/org/apache/rocketmq/graalvm/CInterface.java @@ -52,7 +52,11 @@ public class CInterface { static class CPropertiesDirectives implements CContext.Directives { public List<String> getOptions() { - return Arrays.asList("-I/usr/local/include"); + if ("true".equalsIgnoreCase(System.getProperty("OPEN_DUAL_ABI"))) { + System.out.println("-D_GLIBCXX_USE_CXX11_ABI=1 -I/usr/local/include"); + return Arrays.asList("-D_GLIBCXX_USE_CXX11_ABI=1 -I/usr/local/include"); + } + return Arrays.asList("-D_GLIBCXX_USE_CXX11_ABI=0 -I/usr/local/include"); } public List<String> getHeaderFiles() { @@ -62,14 +66,6 @@ public class CInterface { */ return Collections.singletonList("<rocketmq/rocketmq.h>"); } - - public List<String> getMacroDefinitions() { - if ("true".equalsIgnoreCase(System.getProperty("OPEN_DUAL_ABI"))) { - System.out.println("-D_GLIBCXX_USE_CXX11_ABI=1"); - return Arrays.asList("-D_GLIBCXX_USE_CXX11_ABI=1"); - } - return Arrays.asList("-D_GLIBCXX_USE_CXX11_ABI=0"); - } } @CStruct("message") interface CMessage extends PointerBase {
