diff options
| author | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-15 17:49:45 +0000 |
|---|---|---|
| committer | binji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-15 17:49:45 +0000 |
| commit | 55a827f89041e8b439600db9962cbf4b5cda10cc (patch) | |
| tree | f1570eeb7a98c480b77df4a297a538291c1c767e /native_client_sdk | |
| parent | 1f2c8f8dc2c709e5ee4e3cfd358a6338abeb14c9 (diff) | |
| download | chromium_src-55a827f89041e8b439600db9962cbf4b5cda10cc.zip chromium_src-55a827f89041e8b439600db9962cbf4b5cda10cc.tar.gz chromium_src-55a827f89041e8b439600db9962cbf4b5cda10cc.tar.bz2 | |
[NaCl SDK] Fix Linux builder breakage introduced by r243629.
I removed the PNACL_BIN variable from nacl_llvm.mk, which was used by the
Bullet demo in native_client_sdk/src/gonacl_appengine/src/bullet.
(No trybots, as this change is only run by the linux_nacl_sdk builder).
BUG=none
R=sbc@chromium.org
Review URL: https://codereview.chromium.org/132403009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244927 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rw-r--r-- | native_client_sdk/src/gonacl_appengine/src/bullet/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/native_client_sdk/src/gonacl_appengine/src/bullet/Makefile b/native_client_sdk/src/gonacl_appengine/src/bullet/Makefile index 85de2ba..77ff8c0 100644 --- a/native_client_sdk/src/gonacl_appengine/src/bullet/Makefile +++ b/native_client_sdk/src/gonacl_appengine/src/bullet/Makefile @@ -13,7 +13,7 @@ include $(NACL_SDK_ROOT)/tools/common.mk TARGET = NaClAMBullet LIBS = BulletDynamics BulletCollision LinearMath ppapi pthread -USR_INCLUDE=$(dir $(PNACL_BIN))/usr/include +USR_INCLUDE=$(NACL_SDK_ROOT)/toolchain/$(OSNAME)_pnacl/usr/include BULLET_INCLUDE=$(USR_INCLUDE)/bullet CFLAGS = -I$(CURDIR) -I$(BULLET_INCLUDE) |