diff options
| author | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 17:35:23 +0000 |
|---|---|---|
| committer | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 17:35:23 +0000 |
| commit | 425aa6f8704900b6c613879712d0391e1a5b2d21 (patch) | |
| tree | 1cf05d7b1d192e6111e79068db1ffd8aa70754d7 /third_party | |
| parent | 833d322d04ebad81ad4f3fd7a96949d18045a094 (diff) | |
| download | chromium_src-425aa6f8704900b6c613879712d0391e1a5b2d21.zip chromium_src-425aa6f8704900b6c613879712d0391e1a5b2d21.tar.gz chromium_src-425aa6f8704900b6c613879712d0391e1a5b2d21.tar.bz2 | |
Explicitly provide path to C built-in includes in libc++ builds.
Temporary workaround for a goma bug.
BUG=337426
TBR=glider@chromium.org
Review URL: https://codereview.chromium.org/167113004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251365 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libc++/libc++.gyp | 6 | ||||
| -rw-r--r-- | third_party/libc++abi/libc++abi.gyp | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/third_party/libc++/libc++.gyp b/third_party/libc++/libc++.gyp index fd9c604..7f87ead 100644 --- a/third_party/libc++/libc++.gyp +++ b/third_party/libc++/libc++.gyp @@ -42,6 +42,8 @@ 'include_dirs': [ 'trunk/include', '../libc++abi/trunk/include', + # TODO(earthdok): remove when http://crbug.com/337426 is fixed + '../llvm-build/Release+Asserts/lib/clang/3.5/include/' ], 'cflags': [ '-g', '-Os', '-fPIC', @@ -71,6 +73,10 @@ '-stdlib=libc++', '-L<(PRODUCT_DIR)/lib/', ], + 'include_dirs': [ + # TODO(earthdok): remove when http://crbug.com/337426 is fixed + '../llvm-build/Release+Asserts/lib/clang/3.5/include/' + ], }], ], }, diff --git a/third_party/libc++abi/libc++abi.gyp b/third_party/libc++abi/libc++abi.gyp index 6e56ff9..0a1ab54 100644 --- a/third_party/libc++abi/libc++abi.gyp +++ b/third_party/libc++abi/libc++abi.gyp @@ -32,7 +32,9 @@ ], 'include_dirs': [ 'trunk/include', - '../libc++/trunk/include' + '../libc++/trunk/include', + # TODO(earthdok): remove when http://crbug.com/337426 is fixed + '../llvm-build/Release+Asserts/lib/clang/3.5/include/' ], 'cflags': [ '-g', '-O3', '-fPIC', @@ -66,6 +68,10 @@ 'ldflags': [ '-L<(PRODUCT_DIR)/lib/', ], + 'include_dirs': [ + # TODO(earthdok): remove when http://crbug.com/337426 is fixed + '../llvm-build/Release+Asserts/lib/clang/3.5/include/' + ], }], ], }, |