File tree Expand file tree Collapse file tree 2 files changed +3
-6
lines changed Expand file tree Collapse file tree 2 files changed +3
-6
lines changed Original file line number Diff line number Diff line change @@ -70,10 +70,7 @@ ARG musl_target
7070RUN git clone https://github.com/crystal-lang/shards \
7171 && cd shards \
7272 && git checkout ${shards_version} \
73- # FIXME: This is a workaround for shards' Makefile not touching `shard.lock`
74- # when SHARDS=false
75- && touch shard.lock \
76- && make SHARDS=false CRYSTAL=/crystal/bin/crystal \
73+ && make CRYSTAL=/crystal/bin/crystal \
7774 FLAGS="--stats --target ${musl_target} --static ${release:+--release}" \
7875 \
7976 && bin/shards --version \
Original file line number Diff line number Diff line change 9797 crflags = "--no-debug --release"
9898
9999 # Build native
100- make "bin/shards SHARDS=false CRYSTAL=#{ install_dir } /bin/crystal FLAGS='#{ crflags } '" , env : env
100+ make "bin/shards CRYSTAL=#{ install_dir } /bin/crystal FLAGS='#{ crflags } '" , env : env
101101 move "bin/shards" , "bin/shards_#{ ohai [ 'kernel' ] [ 'machine' ] } "
102102
103103 # Clean
107107 other_machine = ohai [ 'kernel' ] [ 'machine' ] == "x86_64" ? "arm64" : "x86_64"
108108 other_target = "#{ other_machine } -apple-macosx#{ ENV [ "MACOSX_DEPLOYMENT_TARGET" ] } "
109109 crflags += " --cross-compile --target #{ other_target } "
110- make "bin/shards SHARDS=false CRYSTAL=#{ install_dir } /bin/crystal FLAGS='#{ crflags } '" , env : env
110+ make "bin/shards CRYSTAL=#{ install_dir } /bin/crystal FLAGS='#{ crflags } '" , env : env
111111 command "clang bin/shards.o -o bin/shards_#{ other_machine } -target #{ other_target } -L#{ install_dir } /embedded/lib -lyaml -lpcre2-8 -lgc -lpthread -levent -liconv -ldl" , env : env
112112
113113 # Lipo them up
You can’t perform that action at this time.
0 commit comments