aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--Makefile8
-rw-r--r--templates/Makefile.template4
2 files changed, 6 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index e1dedb5912..384204cd46 100644
--- a/Makefile
+++ b/Makefile
@@ -1987,7 +1987,7 @@ endif
endif
ifneq ($(SYSTEM),MINGW32)
ifneq ($(SYSTEM),Darwin)
- $(Q) ldconfig
+ $(Q) ldconfig || true
endif
endif
@@ -2006,7 +2006,7 @@ endif
endif
ifneq ($(SYSTEM),MINGW32)
ifneq ($(SYSTEM),Darwin)
- $(Q) ldconfig
+ $(Q) ldconfig || true
endif
endif
@@ -2025,7 +2025,7 @@ endif
endif
ifneq ($(SYSTEM),MINGW32)
ifneq ($(SYSTEM),Darwin)
- $(Q) ldconfig
+ $(Q) ldconfig || true
endif
endif
@@ -2036,7 +2036,7 @@ ifneq ($(PROTOBUF_DEP),)
$(Q) $(MAKE) -C third_party/protobuf install prefix=$(prefix)
ifneq ($(SYSTEM),MINGW32)
ifneq ($(SYSTEM),Darwin)
- $(Q) ldconfig
+ $(Q) ldconfig || true
endif
endif
endif
diff --git a/templates/Makefile.template b/templates/Makefile.template
index b302623cd9..dead8b8d66 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -780,7 +780,7 @@ endif
% endfor
ifneq ($(SYSTEM),MINGW32)
ifneq ($(SYSTEM),Darwin)
- $(Q) ldconfig
+ $(Q) ldconfig || true
endif
endif
</%def>
@@ -800,7 +800,7 @@ ifneq ($(PROTOBUF_DEP),)
$(Q) $(MAKE) -C third_party/protobuf install prefix=$(prefix)
ifneq ($(SYSTEM),MINGW32)
ifneq ($(SYSTEM),Darwin)
- $(Q) ldconfig
+ $(Q) ldconfig || true
endif
endif
endif