| Message ID | tencent_BA4B93E61E1096A6DAA7C1AAB653321C7F06@qq.com |
|---|---|
| State | Accepted |
| Commit | 35420ab7fd76bdcf43a2f671c39a2555a5fba488 |
| Headers | show |
| Series | [FFmpeg-devel,1/2] build: add .metal to vpath to fix build error | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_ppc | success | Make finished |
| andriy/make_fate_ppc | success | Make fate finished |
On Mon, Dec 20, 2021 at 1:09 AM Zhao Zhili <quinkblack@foxmail.com> wrote: > --- > ffbuild/common.mak | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/ffbuild/common.mak b/ffbuild/common.mak > index e79b509425..c13148f476 100644 > --- a/ffbuild/common.mak > +++ b/ffbuild/common.mak > @@ -113,13 +113,13 @@ $(BIN2CEXE): ffbuild/bin2c_host.o > $(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $^ $(HOSTEXTRALIBS) > > %.metal.air: %.metal > - $(METALCC) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) -o $@ > + $(METALCC) $< -o $@ > > %.metallib: %.metal.air > - $(METALLIB) --split-module-without-linking $(patsubst > $(SRC_PATH)/%,$(SRC_LINK)/%,$<) -o $@ > + $(METALLIB) --split-module-without-linking $< -o $@ > > %.metallib.c: %.metallib $(BIN2CEXE) > - $(BIN2C) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) $@ $(subst > .,_,$(basename $(notdir $@))) > + $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@))) > > %.ptx: %.cu $(SRC_PATH)/compat/cuda/cuda_runtime.h > $(COMPILE_NVCC) > Both patches applied. Thank you! > -- > 2.31.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". >
diff --git a/ffbuild/common.mak b/ffbuild/common.mak index e79b509425..c13148f476 100644 --- a/ffbuild/common.mak +++ b/ffbuild/common.mak @@ -113,13 +113,13 @@ $(BIN2CEXE): ffbuild/bin2c_host.o $(HOSTLD) $(HOSTLDFLAGS) $(HOSTLD_O) $^ $(HOSTEXTRALIBS) %.metal.air: %.metal - $(METALCC) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) -o $@ + $(METALCC) $< -o $@ %.metallib: %.metal.air - $(METALLIB) --split-module-without-linking $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) -o $@ + $(METALLIB) --split-module-without-linking $< -o $@ %.metallib.c: %.metallib $(BIN2CEXE) - $(BIN2C) $(patsubst $(SRC_PATH)/%,$(SRC_LINK)/%,$<) $@ $(subst .,_,$(basename $(notdir $@))) + $(BIN2C) $< $@ $(subst .,_,$(basename $(notdir $@))) %.ptx: %.cu $(SRC_PATH)/compat/cuda/cuda_runtime.h $(COMPILE_NVCC)