File tree Expand file tree Collapse file tree 1 file changed +2
-2
lines changed
Expand file tree Collapse file tree 1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -571,7 +571,7 @@ $(_tests:%=check-%): check-%: % \
571571 export DYLD_LIBRARY_PATH="$(_LD_LIBRARY_PATH):$$DYLD_LIBRARY_PATH"; \
572572 export _DYLD_LIBRARY_PATH="$$DYLD_LIBRARY_PATH"; \
573573 export DYLD_INSERT_LIBRARIES="$(LD_INSERT_LIBRARIES)"; \
574- $(if $(_log-env),export $(_log-env);) \
574+ $(if $(strip $( _log-env) ),export $(_log-env);) \
575575 cd $(*D) && if $(_log-compiler) $(_log-flags) \
576576 $(_<P) $($*-args) >$(*F).log 2>&1; \
577577 then status=$$?; res=PASS; color=$(c_green); \
@@ -651,7 +651,7 @@ define _san
651651 cxxflags += $$(if $$(have_$1 ) ,$$(_$1_flags ) )
652652 endif
653653 ldflags += $$(if $$(have_$1 ) ,$(firstword $(_$1_flags ) ) )
654- have_san + = $$(have_$1 )
654+ have_san : = $$(or $$( have_san ) , $$( have_$1 ) )
655655 ld_preload_san += $$(if $$(have_$1 ) ,$$$$($(CC ) -print-file-name=lib$1.so) )
656656endef
657657
You can’t perform that action at this time.
0 commit comments