diff options
| author | piman <piman@chromium.org> | 2014-09-12 15:10:41 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-12 22:19:18 +0000 |
| commit | 1c5731d3c4397e3ad41ae3c47089896d057a59c2 (patch) | |
| tree | 2ad31af5abfbeb96ae16d038ec896a71e52a4cf6 /third_party/yasm | |
| parent | 3806e82b48f9695f939db28621f9a2009bbd2a33 (diff) | |
| download | chromium_src-1c5731d3c4397e3ad41ae3c47089896d057a59c2.zip chromium_src-1c5731d3c4397e3ad41ae3c47089896d057a59c2.tar.gz chromium_src-1c5731d3c4397e3ad41ae3c47089896d057a59c2.tar.bz2 | |
gn: fix last_commit_position.py and yasm_assemble.gni
1- use the correct directory for git commands
2- yasm needs . in the include search path, otherwise I get:
FAILED: python ../../../third_party/yasm/run_yasm.py ./yasm -DPIC -felf64 -m amd64 -I../../.. -Igen -DARCH_X86_64 -w -P ../../../third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.asm -I../../../third_party/ffmpeg/chromium/config/Chromium/linux/x64 -I../../../third_party/ffmpeg/libavcodec/x86 -I../../../third_party/ffmpeg/libavutil/x86 -I../../../third_party/ffmpeg -DPIC -o obj/third_party/ffmpeg/vp8dsp.o ../../../third_party/ffmpeg/libavcodec/x86/vp8dsp.asm
yasm: FATAL: unable to open include file `../../../third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.asm'
BUG=None
Review URL: https://codereview.chromium.org/561193004
Cr-Commit-Position: refs/heads/master@{#294679}
Diffstat (limited to 'third_party/yasm')
| -rw-r--r-- | third_party/yasm/yasm_assemble.gni | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/third_party/yasm/yasm_assemble.gni b/third_party/yasm/yasm_assemble.gni index 78037b8..ed89829 100644 --- a/third_party/yasm/yasm_assemble.gni +++ b/third_party/yasm/yasm_assemble.gni @@ -84,6 +84,7 @@ if (is_mac || is_ios) { # Default yasm include dirs. Make it match the native build (source root and # root generated code directory). _yasm_flags += [ + "-I.", # Using "//." will produce a relative path "../.." which looks better than # "../../" which will result from using "//" as the base (although both # work). This is because rebase_path will terminate the result in a slash if |