diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-07-28 08:12:57 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-07-28 09:05:52 +0200 |
| commit | d668c9a04d04d256fcbbd2165fe226f1db88256b (patch) | |
| tree | c78400ef596fcabd74896b79572fa5c08e442f04 /external | |
| parent | 27798238ecb200e0753b013c79df0e6c014c7a7a (diff) | |
Adapt --enable-ld to Clang 12 trunk --ld-path
...split from -fuse-ld with <https://github.com/llvm/llvm-project/commit/
1bc5c84710a8c73ef21295e63c19d10a8c71f2f5> "[Driver] Add --ld-path= and deprecate
-fuse-ld=/abs/path and -fuse-ld=rel/path", and now causing warnings (or even
errors with -Werror) like
'-fuse-ld=' taking a path is deprecated. Use '--ld-path=' instead
when --enable-ld is configured as a full path. (--enable-ld was vague whether
it supports full paths, but it appeared to work reasonably well at least with
old versions of Clang.)
Change-Id: I5a7dfd992b56aba78dd3646045fb9a827dc40321
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99569
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/liborcus/ExternalProject_liborcus.mk | 2 | ||||
| -rw-r--r-- | external/liborcus/libtool.patch.0 | 2 | ||||
| -rw-r--r-- | external/libwps/ExternalProject_libwps.mk | 2 | ||||
| -rw-r--r-- | external/libwps/libtool.patch.0 | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk index 38658cc81908..136fa538397e 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -86,7 +86,7 @@ ifeq ($(ENABLE_GDB_INDEX),TRUE) liborcus_LDFLAGS+=-Wl,--gdb-index liborcus_CXXFLAGS+=-ggnu-pubnames ifneq ($(USE_LD),) -liborcus_LDFLAGS += -fuse-ld=$(USE_LD) +liborcus_LDFLAGS += $(USE_LD) endif endif diff --git a/external/liborcus/libtool.patch.0 b/external/liborcus/libtool.patch.0 index 93b677303374..aa6ffa908ec3 100644 --- a/external/liborcus/libtool.patch.0 +++ b/external/liborcus/libtool.patch.0 @@ -5,7 +5,7 @@ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ - -specs=*|-fsanitize=*) -+ -specs=*|-fsanitize=*|-fuse-ld=*) ++ -specs=*|-fsanitize=*|-fuse-ld=*|--ld-path=*) func_quote_for_eval "$arg" arg=$func_quote_for_eval_result func_append compile_command " $arg" diff --git a/external/libwps/ExternalProject_libwps.mk b/external/libwps/ExternalProject_libwps.mk index a7c37aeddf7e..0bcfc5ceb72d 100644 --- a/external/libwps/ExternalProject_libwps.mk +++ b/external/libwps/ExternalProject_libwps.mk @@ -38,7 +38,7 @@ ifeq ($(ENABLE_GDB_INDEX),TRUE) libwps_LDFLAGS+=-Wl,--gdb-index libwps_CXXFLAGS+=-ggnu-pubnames ifneq ($(USE_LD),) -libwps_LDFLAGS += -fuse-ld=$(USE_LD) +libwps_LDFLAGS += $(USE_LD) endif endif diff --git a/external/libwps/libtool.patch.0 b/external/libwps/libtool.patch.0 index d3989d79927d..f2e10ac3822f 100644 --- a/external/libwps/libtool.patch.0 +++ b/external/libwps/libtool.patch.0 @@ -5,7 +5,7 @@ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ - -fsanitize=*) -+ -fsanitize=*|-fuse-ld=*) ++ -fsanitize=*|-fuse-ld=*|--ld-path=*) func_quote_for_eval "$arg" arg=$func_quote_for_eval_result func_append compile_command " $arg" |