com php-fuzzing-sapi: Fix regular build: Makefile.frag config.m4

From: Date: Mon, 04 Mar 2019 21:21:58 +0000
Subject: com php-fuzzing-sapi: Fix regular build: Makefile.frag config.m4
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-105124@lists.php.net to get a copy of this message
Commit: 8e5e991e8f72db50e52e6636d3028ed27830c286 Author: Stanislav Malyshev <smalyshev@gmail.com> Mon, 4 Mar 2019 13:20:09 -0800 Parents: 2b1e2df207cb07fd01a7a5ee8448e4f71aff6222 Branches: master Link: http://git.php.net/?p=php-fuzzing-sapi.git;a=commitdiff;h=8e5e991e8f72db50e52e6636d3028ed27830c286 Log: Fix regular build Changed paths: M Makefile.frag M config.m4 Diff: diff --git a/Makefile.frag b/Makefile.frag index befcc6d..b1398d8 100644 --- a/Makefile.frag +++ b/Makefile.frag @@ -1,10 +1,10 @@ fuzzer: $(PHP_FUZZER_BINARIES) $(SAPI_FUZZER_PATH)/php-fuzz-parser: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(PHP_FUZZER_PARSER_OBJS) - $(LIBTOOL) --mode=link $(FUZZING_CC) -stdlib=libc++ -export-dynamic $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS_PROGRAM) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FUZZER_PARSER_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) $(FUZZING_LIB) -o $(SAPI_FUZZER_PATH)/php-fuzz-parser + $(LIBTOOL) --mode=link $(FUZZING_CC) -export-dynamic $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS_PROGRAM) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FUZZER_PARSER_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) $(FUZZING_LIB) -o $(SAPI_FUZZER_PATH)/php-fuzz-parser $(SAPI_FUZZER_PATH)/php-fuzz-unserialize: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(PHP_FUZZER_UNSERIALIZE_OBJS) - $(LIBTOOL) --mode=link $(FUZZING_CC) -stdlib=libc++ -export-dynamic $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS_PROGRAM) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FUZZER_UNSERIALIZE_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) $(FUZZING_LIB) -o $(SAPI_FUZZER_PATH)/php-fuzz-unserialize + $(LIBTOOL) --mode=link $(FUZZING_CC) -export-dynamic $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS_PROGRAM) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FUZZER_UNSERIALIZE_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) $(FUZZING_LIB) -o $(SAPI_FUZZER_PATH)/php-fuzz-unserialize $(SAPI_FUZZER_PATH)/php-fuzz-json: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(PHP_FUZZER_JSON_OBJS) - $(LIBTOOL) --mode=link $(FUZZING_CC) -stdlib=libc++ -export-dynamic $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS_PROGRAM) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FUZZER_JSON_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) $(FUZZING_LIB) -o $(SAPI_FUZZER_PATH)/php-fuzz-json + $(LIBTOOL) --mode=link $(FUZZING_CC) -export-dynamic $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(EXTRA_LDFLAGS_PROGRAM) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_BINARY_OBJS) $(PHP_FUZZER_JSON_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) $(FUZZING_LIB) -o $(SAPI_FUZZER_PATH)/php-fuzz-json diff --git a/config.m4 b/config.m4 index d5a5445..bc52df3 100644 --- a/config.m4 +++ b/config.m4 @@ -23,7 +23,7 @@ if test "$PHP_FUZZER" != "no"; then ]) else FUZZING_LIB="-lFuzzingEngine" - FUZZING_CC="$CXX" + FUZZING_CC="$CXX -stdlib=libc++" fi PHP_SUBST(FUZZING_LIB) PHP_SUBST(FUZZING_CC)

« previous php.cvs (#105124) next »