diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-22 16:30:29 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-22 16:30:37 +0200 |
| commit | c1692439e081dcc259489a1c2ddc2a659870dce6 (patch) | |
| tree | 8dd147f4277f59305cb82b6ca3cfbacb3dcaba8e /tests | |
| parent | c7e6443441ed5c1b5f64067dfbf4956bc2c6acbb (diff) | |
| parent | 3ae0e721c7b6e0483801b9039b3d140e3b68b7f5 (diff) | |
| download | ffmpeg-c1692439e081dcc259489a1c2ddc2a659870dce6.tar.gz | |
Merge commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5'
* commit '3ae0e721c7b6e0483801b9039b3d140e3b68b7f5':
checkasm: Always link statically
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/checkasm/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile index 4c0ffab884..909f2f00ad 100644 --- a/tests/checkasm/Makefile +++ b/tests/checkasm/Makefile @@ -22,8 +22,8 @@ tests/checkasm/%.o: CFLAGS := $(CFLAGS:-Wstrict-prototypes=-Wno-strict-prototype CHECKASM := tests/checkasm/checkasm$(EXESUF) -$(CHECKASM): $(EXEOBJS) $(CHECKASMOBJS) $(FF_DEP_LIBS) - $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(CHECKASMOBJS) $(FF_EXTRALIBS) +$(CHECKASM): $(EXEOBJS) $(CHECKASMOBJS) $(FF_STATIC_DEP_LIBS) + $(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(CHECKASMOBJS) $(FF_STATIC_DEP_LIBS) $(EXTRALIBS) checkasm: $(CHECKASM) |