This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10252

fuzz: use Python 3 in makefile
ClosedPublic

Authored by martinvonz on Mar 22 2021, 6:35 PM.

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHG1977495dbbe2: fuzz: use Python 3 in makefile
Summary

As in the previous patch, I copied the snippet defining PYTHON from
the root Makefile.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Mar 22 2021, 6:35 PM
mharbison72 accepted this revision.Mar 23 2021, 12:40 AM
This revision is now accepted and ready to land.Mar 23 2021, 12:40 AM
martinvonz added a commit: rHG1977495dbbe2: fuzz: use Python 3 in makefile.Mar 23 2021, 12:47 AM
Closed by commit rHG1977495dbbe2: fuzz: use Python 3 in makefile (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mcontrib/fuzz/Makefile (11 lines)

Diff 26554

contrib/fuzz/Makefile

CC ?= clang CC ?= clang
CXX ?= clang++ CXX ?= clang++
# By default, use our own standalone_fuzz_target_runner. # By default, use our own standalone_fuzz_target_runner.
# This runner does no fuzzing, but simply executes the inputs # This runner does no fuzzing, but simply executes the inputs
# provided via parameters. # provided via parameters.
# Run e.g. "make all LIB_FUZZING_ENGINE=/path/to/libFuzzer.a" # Run e.g. "make all LIB_FUZZING_ENGINE=/path/to/libFuzzer.a"
# to link the fuzzer(s) against a real fuzzing engine. # to link the fuzzer(s) against a real fuzzing engine.
# #
# OSS-Fuzz will define its own value for LIB_FUZZING_ENGINE. # OSS-Fuzz will define its own value for LIB_FUZZING_ENGINE.
LIB_FUZZING_ENGINE ?= standalone_fuzz_target_runner.o LIB_FUZZING_ENGINE ?= standalone_fuzz_target_runner.o
# Default to Python 3.
#
# Windows ships Python 3 as `python.exe`, which may not be on PATH. py.exe is.
ifeq ($(OS),Windows_NT)
PYTHON?=py -3
else
PYTHON?=python3
endif
PYTHON_CONFIG ?= $$OUT/sanpy/bin/python-config PYTHON_CONFIG ?= $$OUT/sanpy/bin/python-config
PYTHON_CONFIG_FLAGS ?= --ldflags --embed PYTHON_CONFIG_FLAGS ?= --ldflags --embed
CXXFLAGS += -Wno-deprecated-register CXXFLAGS += -Wno-deprecated-register
all: standalone_fuzz_target_runner.o oss-fuzz all: standalone_fuzz_target_runner.o oss-fuzz
standalone_fuzz_target_runner.o: standalone_fuzz_target_runner.cc standalone_fuzz_target_runner.o: standalone_fuzz_target_runner.cc
$$OUT/%_fuzzer_seed_corpus.zip: %_corpus.py $$OUT/%_fuzzer_seed_corpus.zip: %_corpus.py
python $< $@ $(PYTHON) $< $@
pyutil.o: pyutil.cc pyutil.h pyutil.o: pyutil.cc pyutil.h
$(CXX) $(CXXFLAGS) -g -O1 \ $(CXX) $(CXXFLAGS) -g -O1 \
`$(PYTHON_CONFIG) --cflags` \ `$(PYTHON_CONFIG) --cflags` \
-I../../mercurial -c -o pyutil.o pyutil.cc -I../../mercurial -c -o pyutil.o pyutil.cc
bdiff-oss-fuzz.o: ../../mercurial/bdiff.c bdiff-oss-fuzz.o: ../../mercurial/bdiff.c
$(CC) $(CFLAGS) -c -o bdiff-oss-fuzz.o ../../mercurial/bdiff.c $(CC) $(CFLAGS) -c -o bdiff-oss-fuzz.o ../../mercurial/bdiff.c