From d9e0ecb52075dbf65ba6218bf003b64f9fd0fa67 Mon Sep 17 00:00:00 2001
From: AdamKorcz <adam@adalogics.com>
Date: Thu, 19 Nov 2020 13:45:38 +0000
Subject: [PATCH 1/3] Removed -fsanitize flag from cmake file
---
jerry-main/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/jerry-main/CMakeLists.txt b/jerry-main/CMakeLists.txt
index f722485ea9..7b4cbe1730 100644
--- a/jerry-main/CMakeLists.txt
+++ b/jerry-main/CMakeLists.txt
@@ -59,7 +59,7 @@ endmacro()
# Jerry with libfuzzer support
if(JERRY_LIBFUZZER)
jerry_create_executable("jerry-libfuzzer" "libfuzzer.c")
- target_link_libraries("jerry-libfuzzer" jerry-port-default -fsanitize=fuzzer)
+ target_link_libraries("jerry-libfuzzer" jerry-port-default)
endif()
# Jerry standalones
From c132763d643a393b7a896bd3b2213b0b7e8fcf12 Mon Sep 17 00:00:00 2001
From: AdamKorcz <adam@adalogics.com>
Date: Tue, 8 Dec 2020 17:47:09 +0000
Subject: [PATCH 2/3] Added oss-fuzz flag
---
jerry-main/CMakeLists.txt | 6 +++++-
tools/build.py | 3 +++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/jerry-main/CMakeLists.txt b/jerry-main/CMakeLists.txt
index 7b4cbe1730..9da5823b30 100644
--- a/jerry-main/CMakeLists.txt
+++ b/jerry-main/CMakeLists.txt
@@ -59,7 +59,11 @@ endmacro()
# Jerry with libfuzzer support
if(JERRY_LIBFUZZER)
jerry_create_executable("jerry-libfuzzer" "libfuzzer.c")
- target_link_libraries("jerry-libfuzzer" jerry-port-default)
+ if(OSS_FUZZ)
+ target_link_libraries("jerry-libfuzzer" jerry-port-default)
+ else()
+ target_link_libraries("jerry-libfuzzer" jerry-port-default -fsanitize=fuzzer)
+ endif()
endif()
# Jerry standalones
diff --git a/tools/build.py b/tools/build.py
index e30f00e4ae..de4dbf8188 100755
--- a/tools/build.py
+++ b/tools/build.py
@@ -96,6 +96,8 @@ def devhelp(helpstring):
help=devhelp('build test version of the jerry command line tool (%(choices)s)'))
compgrp.add_argument('--libfuzzer', metavar='X', choices=['ON', 'OFF'], type=str.upper,
help=devhelp('build jerry with libfuzzer support (%(choices)s)'))
+ compgrp.add_argument('--oss-fuzz', metavar='X', choices=['ON', 'OFF'], type=str.upper,
+ help=devhelp('build jerry to run on OSS-fuzz (%(choices)s)'))
compgrp.add_argument('--jerry-ext', metavar='X', choices=['ON', 'OFF'], type=str.upper,
help='build jerry-ext (%(choices)s)')
compgrp.add_argument('--jerry-libm', metavar='X', choices=['ON', 'OFF'], type=str.upper,
@@ -188,6 +190,7 @@ def build_options_append(cmakeopt, cliarg):
build_options_append('JERRY_CMDLINE_SNAPSHOT', arguments.jerry_cmdline_snapshot)
build_options_append('JERRY_CMDLINE_TEST', arguments.jerry_cmdline_test)
build_options_append('JERRY_LIBFUZZER', arguments.libfuzzer)
+ build_options_append('OSS_FUZZ', arguments.oss_fuzz)
build_options_append('JERRY_EXT', arguments.jerry_ext)
build_options_append('JERRY_LIBM', arguments.jerry_libm)
build_options_append('JERRY_PORT_DEFAULT', arguments.jerry_port_default)
From 3369f262f8fe80ea1c4e1b8ef498c98a1f9b45d4 Mon Sep 17 00:00:00 2001
From: AdamKorcz <adam@adalogics.com>
Date: Sat, 12 Dec 2020 11:43:47 +0000
Subject: [PATCH 3/3] Added JERRY_ prefix for cmake variables
JerryScript-DCO-1.0-Signed-off-by: AdamKorcz adam@adalogics.com
---
jerry-main/CMakeLists.txt | 2 +-
tools/build.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/jerry-main/CMakeLists.txt b/jerry-main/CMakeLists.txt
index 9da5823b30..228601317f 100644
--- a/jerry-main/CMakeLists.txt
+++ b/jerry-main/CMakeLists.txt
@@ -59,7 +59,7 @@ endmacro()
# Jerry with libfuzzer support
if(JERRY_LIBFUZZER)
jerry_create_executable("jerry-libfuzzer" "libfuzzer.c")
- if(OSS_FUZZ)
+ if(JERRY_OSS_FUZZ)
target_link_libraries("jerry-libfuzzer" jerry-port-default)
else()
target_link_libraries("jerry-libfuzzer" jerry-port-default -fsanitize=fuzzer)
diff --git a/tools/build.py b/tools/build.py
index de4dbf8188..6683c17e7b 100755
--- a/tools/build.py
+++ b/tools/build.py
@@ -190,7 +190,7 @@ def build_options_append(cmakeopt, cliarg):
build_options_append('JERRY_CMDLINE_SNAPSHOT', arguments.jerry_cmdline_snapshot)
build_options_append('JERRY_CMDLINE_TEST', arguments.jerry_cmdline_test)
build_options_append('JERRY_LIBFUZZER', arguments.libfuzzer)
- build_options_append('OSS_FUZZ', arguments.oss_fuzz)
+ build_options_append('JERRY_OSS_FUZZ', arguments.oss_fuzz)
build_options_append('JERRY_EXT', arguments.jerry_ext)
build_options_append('JERRY_LIBM', arguments.jerry_libm)
build_options_append('JERRY_PORT_DEFAULT', arguments.jerry_port_default)