aboutsummaryrefslogtreecommitdiff
path: root/Makefile.rules
diff options
context:
space:
mode:
authorJan Voung <jvoung@google.com>2012-07-31 09:19:14 -0700
committerDerek Schuff <dschuff@chromium.org>2012-07-31 09:19:14 -0700
commitb72d2a7aa1868c1cd6e8593e991645833b4212a5 (patch)
tree82800ebf498f3f47c643ce0b5f058681f9a1219b /Makefile.rules
parentad7cfbb9e7768d391b764836795d154dcbddc386 (diff)
Specify that sandboxed llc should be bitcode-linked with non-irt private libs
http://codereview.chromium.org/10696050/
Diffstat (limited to 'Makefile.rules')
-rw-r--r--Makefile.rules8
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.rules b/Makefile.rules
index 6ea6eb5938..a3ffbd41e4 100644
--- a/Makefile.rules
+++ b/Makefile.rules
@@ -639,7 +639,13 @@ endif
endif
ifeq ($(NACL_SANDBOX),1)
- LIBS += -lsrpc -limc_syscalls -lplatform -lgio -lpthread -lm -lnacl -lnacl_dyncode -lnosys
+ # NOTE: we specify --noirt to tell the driver that we should link
+ # against private (non-stable, non-IRT) libraries for the
+ # sandboxed translator. This could have been specified directly,
+ # except that LLVM slips in -lpthread elsewhere in the build system,
+ # and we need it to use -lpthread_private instead.
+ LIBS += -Wl,--noirt -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