diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-19 13:01:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-19 13:01:06 +0100 |
| commit | 1b03e09198e5db75064b202e00bd77f84fa47063 (patch) | |
| tree | 8762aef7ade71799436a3f02d91087a807c7ebbb /configure | |
| parent | a5faae46a393d52bebf95ac76580968453f10b6c (diff) | |
| parent | ef5d41a5534b65f03d02f2e11a503ab8416bfc3b (diff) | |
Merge commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b'
* commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b':
x86inc: Rename "program_name" to "private_prefix"
configure: Run SHFLAGS through ldflags_filter()
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4385,7 +4385,7 @@ LD_PATH=$LD_PATH DLLTOOL=$dlltool LDFLAGS=$LDFLAGS LDFLAGS-ffserver=$FFSERVERLDFLAGS -SHFLAGS=$SHFLAGS +SHFLAGS=$(echo $($ldflags_filter $SHFLAGS)) YASMFLAGS=$YASMFLAGS BUILDSUF=$build_suffix PROGSSUF=$progs_suffix |