aboutsummaryrefslogtreecommitdiff
path: root/Makefile.rules
diff options
context:
space:
mode:
authorDerek Schuff <dschuff@chromium.org>2012-07-09 10:52:46 -0700
committerDerek Schuff <dschuff@chromium.org>2012-07-09 11:00:37 -0700
commit5dbcc7e0c9c12f4a4042fb4a226654aee927999c (patch)
treeb316a3370e9286cb4e6f81b2f9d8bd8b54ce5123 /Makefile.rules
parent86dc97be9ac3b4804528e087b04b4f4192cdee54 (diff)
LOCALMODs from hg 0b098ca44de7 against r158408 (hg 90a87d6bfe45)
(only non-new files; new files in git 4f429c8b) Change-Id: Ia39f818088485bd90e4d048db404f8d6ba5f836b
Diffstat (limited to 'Makefile.rules')
-rw-r--r--Makefile.rules11
1 files changed, 11 insertions, 0 deletions
diff --git a/Makefile.rules b/Makefile.rules
index 4b065239bb..6ea6eb5938 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -638,6 +638,17 @@ endif
endif
endif
+ifeq ($(NACL_SANDBOX),1)
+ LIBS += -lsrpc -limc_syscalls -lplatform -lgio -lpthread -lm -lnacl -lnacl_dyncode -lnosys
+ ifeq ($(USE_TCMALLOC),1)
+ # Note: -ltcmalloc_minimal needs to stay last on the link line
+ LIBS += -ltcmalloc_minimal
+ CXX.Flags += -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free
+ C.Flags += -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free
+ endif
+else
+ LIBS +=
+endif
#----------------------------------------------------------
# Options To Invoke Tools