1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
From 78917f02abc3501bb4ae0cdad82c22dfb2fbbad5 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Sun, 6 Nov 2016 18:46:15 +0100
Subject: [PATCH 08/10] Fix generation of commit_id.h
This might break compiling when not
executing ninja in subdir of source tee
---
src/angle.gyp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/angle.gyp b/src/angle.gyp
index 7a4061d..090b391 100644
--- a/src/angle.gyp
+++ b/src/angle.gyp
@@ -8,7 +8,7 @@
'angle_code': 1,
'angle_gen_path': '<(SHARED_INTERMEDIATE_DIR)/angle',
'angle_id_script_base': 'commit_id.py',
- 'angle_id_script': '<(angle_gen_path)/<(angle_id_script_base)',
+ 'angle_id_script': '<(angle_id_script_base)',
'angle_id_header_base': 'commit.h',
'angle_id_header': '<(angle_gen_path)/id/<(angle_id_header_base)',
'angle_use_commit_id%': '<!(python <(angle_id_script_base) check ..)',
@@ -187,7 +187,7 @@
'action_name': 'Generate ANGLE Commit ID Header',
'message': 'Generating ANGLE Commit ID',
# reference the git index as an input, so we rebuild on changes to the index
- 'inputs': [ '<(angle_id_script)', '<(angle_path)/.git/index' ],
+ 'inputs': [ '<(angle_id_script)', '<(angle_path)/../.git/index' ],
'outputs': [ '<(angle_id_header)' ],
'msvs_cygwin_shell': 0,
'action':
--
2.10.2
|