@@ -130,6 +130,14 @@ resolve_path += && \
130
130
$1_wd=` dirname " $$ {$1 }" ` ; $1=$${$1_}; \
131
131
if [ -z "` echo $$ {$1 } | grep ' ^/' ` " ]; then $1=$${$1_wd}/$${$1}; fi; \
132
132
fi
133
+ else
134
+ # try to use the SO_NAME (if the named file exists)
135
+ resolve_path += && \
136
+ $1_=` objdump -p " $$ {$1 }" | awk ' /SONAME/ {print $$2}' ` && \
137
+ if [ -n "$${$1_}" ]; then \
138
+ $1_=$$(dirname "$${$1}" ) /$${$1_}; \
139
+ if [ -e "$${$1_}" ]; then $1=$${$1_}; fi; \
140
+ fi
133
141
endif
134
142
135
143
# # debug code: `make resolve-path P=<path to test>`
@@ -201,12 +209,12 @@ symlink_system_libraries: $(SYMLINK_SYSTEM_LIBRARIES)
201
209
.PHONY : $(BUILDDIR ) /build_h.jl.phony $(BUILDDIR ) /version_git.jl.phony clean all symlink_*
202
210
203
211
clean :
204
- rm -f $(BUILDDIR ) /pcre_h.jl
205
- rm -f $(BUILDDIR ) /errno_h.jl
206
- rm -f $(BUILDDIR ) /build_h.jl
207
- rm -f $(BUILDDIR ) /build_h.jl.phony
208
- rm -f $(BUILDDIR ) /fenv_constants .jl # To be removed
209
- rm -f $(BUILDDIR ) /uv_constants .jl
210
- rm -f $(BUILDDIR ) /file_constants .jl
211
- rm -f $(BUILDDIR ) /version_git.jl
212
- rm -f $(BUILDDIR ) /version_git.jl.phony
212
+ - rm -f $(BUILDDIR ) /pcre_h.jl
213
+ - rm -f $(BUILDDIR ) /errno_h.jl
214
+ - rm -f $(BUILDDIR ) /build_h.jl
215
+ - rm -f $(BUILDDIR ) /build_h.jl.phony
216
+ - rm -f $(BUILDDIR ) /uv_constants .jl
217
+ - rm -f $(BUILDDIR ) /file_constants .jl
218
+ - rm -f $(BUILDDIR ) /version_git .jl
219
+ - rm -f $(BUILDDIR ) /version_git.jl.phony
220
+ - rm -f $(build_private_libdir ) /lib * . $( SHLIB_EXT ) *
0 commit comments