File tree Expand file tree Collapse file tree 3 files changed +6
-6
lines changed Expand file tree Collapse file tree 3 files changed +6
-6
lines changed Original file line number Diff line number Diff line change 5757 run : |
5858 opam exec -- make LINKING_MODE=static
5959 bin=(./learn-ocaml-client ./learn-ocaml-server ./learn-ocaml)
60- dir="_build/install/default/bin/ "
60+ dir="_build/install/default/bin"
6161 file "$dir"/*
6262 otool -L "$dir"/*
6363 for b in "${bin[@]}"; do ( set -x; "$dir/$b" --version ); done
Original file line number Diff line number Diff line change @@ -100,15 +100,15 @@ BINARIES = src/main/learnocaml_client.bc src/main/learnocaml_main.bc src/main/le
100100.PHONY : detect-libs
101101detect-libs :
102102 $(RM ) $(addprefix _build/default/,$(BINARIES ) )
103- +sort=true ; \
103+ +sort=false ; \
104104 baseid=" detect-libs.$$$$ " ; echo ...; \
105105 $(MAKE ) LINKING_MODE=dynamic OCAMLPARAM=" _,verbose=1" > $$ baseid.log 2>&1 ; \
106106 for bin in $( BINARIES) ; do \
107107 base=$$ {bin#src/main/}; base=$$ {base%.* }; \
108108 grep -e " '$$ bin'" $$ baseid.log > $$ baseid.$$ base.log; \
109109 printf " %s: " " $$ base" ; \
110- sed -e " s/ /\n /g; s/'/ /g" $$ baseid.$$ base.log | grep -e " ^-l" | \
111- if [ " $$ sort" = true ]; then printf " (sorted) " ; sort -u; else cat; fi | xargs; \
110+ sed -e " s/'/ /g; s/ / \\ n /g" $$ baseid.$$ base.log | grep -e " ^-l" | \
111+ if [ " $$ sort" = true ]; then printf " (sorted) " ; sort -u; else cat; fi | xargs echo ; \
112112 done ; echo ; \
113- set +x ; cat $$ baseid.* .log; \
113+ cat $$ baseid.* .log; \
114114 $(RM ) $$ baseid.* log
Original file line number Diff line number Diff line change @@ -32,7 +32,7 @@ case $(uname -s) in
3232 case $( . /etc/os-release && echo $ID ) in
3333 alpine)
3434 COMMON_LIBS=" camlstr base_stubs ssl_threads_stubs ssl crypto cstruct_stubs lwt_unix_stubs bigarray unix c"
35- # `m` and `pthreads ` are built-in musl
35+ # `m` and `pthread ` are built-in musl
3636 echo ' (-noautolink'
3737 echo ' -cclib -Wl,-Bstatic'
3838 echo ' -cclib -static-libgcc'
You can’t perform that action at this time.
0 commit comments