Skip to content

Commit

Permalink
gn: fix last_commit_position.py and yasm_assemble.gni
Browse files Browse the repository at this point in the history
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}
pimanttr authored and Commit bot committed Sep 12, 2014
1 parent 3806e82 commit 1c5731d
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions third_party/yasm/yasm_assemble.gni
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion tools/gn/last_commit_position.py
Original file line number Diff line number Diff line change
@@ -93,7 +93,7 @@ def WriteHeader(header_file, header_guard, value):
output_file = sys.argv[2]
header_guard = sys.argv[3]

value = FetchCommitPosition(".")
value = FetchCommitPosition(git_directory)
if not value:
print "Could not get last commit position."
sys.exit(1)

0 comments on commit 1c5731d

Please sign in to comment.