Skip to content

Commit 81eb6cc

Browse files
committed
Merge bitcoin#31800: depends: Avoid using the -ffile-prefix-map compiler option
407062f depends: Avoid using the `-ffile-prefix-map` compiler option (Hennadii Stepanov) Pull request description: This PR is similar to bitcoin#31337 and applies analogous changes to all dependency packages. The issue was [recently noticed](bitcoin#31661 (comment)) when `-ffile-prefix-map` was added to the `libevent` package, which is built in OSS-Fuzz. This PR replaces `-ffile-prefix-map` in all packages for consistency. Fixes bitcoin#31770. ACKs for top commit: davidgumberg: Tested ACK bitcoin@407062f. theuni: utACK 407062f Tree-SHA512: c501519c2397b7f11cdab13c0cd4b98a73b305817dba6ff61efc1c80c3cb44134bbd7f55eaecc1dab97f817ce44b28b6c81ccef74ea2d62c93ac43130be4efaf
2 parents 2f98d1e + 407062f commit 81eb6cc

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

depends/packages/capnp.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ define $(package)_set_vars :=
99
$(package)_config_opts := -DBUILD_TESTING=OFF
1010
$(package)_config_opts += -DWITH_OPENSSL=OFF
1111
$(package)_config_opts += -DWITH_ZLIB=OFF
12-
$(package)_cxxflags += -ffile-prefix-map=$$($(package)_extract_dir)=/usr
12+
$(package)_cxxflags += -fdebug-prefix-map=$($(package)_extract_dir)=/usr -fmacro-prefix-map=$($(package)_extract_dir)=/usr
1313
endef
1414

1515
define $(package)_config_cmds

depends/packages/libevent.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ define $(package)_set_vars
1313
$(package)_config_opts=-DCMAKE_BUILD_TYPE=None -DEVENT__DISABLE_BENCHMARK=ON -DEVENT__DISABLE_OPENSSL=ON
1414
$(package)_config_opts+=-DEVENT__DISABLE_SAMPLES=ON -DEVENT__DISABLE_REGRESS=ON
1515
$(package)_config_opts+=-DEVENT__DISABLE_TESTS=ON -DEVENT__LIBRARY_TYPE=STATIC
16-
$(package)_cflags += -ffile-prefix-map=$($(package)_extract_dir)=/usr
16+
$(package)_cflags += -fdebug-prefix-map=$($(package)_extract_dir)=/usr -fmacro-prefix-map=$($(package)_extract_dir)=/usr
1717
$(package)_cppflags += -D_GNU_SOURCE
1818
$(package)_cppflags_mingw32=-D_WIN32_WINNT=0x0A00
1919

depends/packages/libmultiprocess.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ifneq ($(host),$(build))
1313
$(package)_config_opts := -DCAPNP_EXECUTABLE="$$(native_capnp_prefixbin)/capnp"
1414
$(package)_config_opts += -DCAPNPC_CXX_EXECUTABLE="$$(native_capnp_prefixbin)/capnpc-c++"
1515
endif
16-
$(package)_cxxflags += -ffile-prefix-map=$$($(package)_extract_dir)=/usr
16+
$(package)_cxxflags += -fdebug-prefix-map=$($(package)_extract_dir)=/usr -fmacro-prefix-map=$($(package)_extract_dir)=/usr
1717
endef
1818

1919
define $(package)_config_cmds

depends/packages/zeromq.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ define $(package)_set_vars
1717
$(package)_config_opts += -DWITH_LIBBSD=OFF -DENABLE_CURVE=OFF -DENABLE_CPACK=OFF
1818
$(package)_config_opts += -DBUILD_SHARED=OFF -DBUILD_TESTS=OFF -DZMQ_BUILD_TESTS=OFF
1919
$(package)_config_opts += -DENABLE_DRAFTS=OFF -DZMQ_BUILD_TESTS=OFF
20-
$(package)_cxxflags += -ffile-prefix-map=$($(package)_extract_dir)=/usr
20+
$(package)_cxxflags += -fdebug-prefix-map=$($(package)_extract_dir)=/usr -fmacro-prefix-map=$($(package)_extract_dir)=/usr
2121
$(package)_config_opts_mingw32 += -DZMQ_WIN32_WINNT=0x0A00 -DZMQ_HAVE_IPC=OFF
2222
endef
2323

0 commit comments

Comments
 (0)