Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1602)

Side by Side Diff: gold/Makefile.am

Issue 703613004: Stop using nacl private, and pthread private libs for gold.nexe (can use IRT). (Closed) Base URL: https://chromium.googlesource.com/native_client/nacl-binutils.git@master
Patch Set: leave pthread alone Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | gold/Makefile.in » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 ## Process this file with automake to generate Makefile.in 1 ## Process this file with automake to generate Makefile.in
2 # 2 #
3 # Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 3 # Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013
4 # Free Software Foundation, Inc. 4 # Free Software Foundation, Inc.
5 # 5 #
6 # This file is free software; you can redistribute it and/or modify 6 # This file is free software; you can redistribute it and/or modify
7 # it under the terms of the GNU General Public License as published by 7 # it under the terms of the GNU General Public License as published by
8 # the Free Software Foundation; either version 3 of the License, or 8 # the Free Software Foundation; either version 3 of the License, or
9 # (at your option) any later version. 9 # (at your option) any later version.
10 # 10 #
(...skipping 28 matching lines...) Expand all
39 39
40 if PLUGINS 40 if PLUGINS
41 LIBDL = @DLOPEN_LIBS@ 41 LIBDL = @DLOPEN_LIBS@
42 endif 42 endif
43 43
44 if THREADS 44 if THREADS
45 THREADSLIB = -lpthread 45 THREADSLIB = -lpthread
46 endif 46 endif
47 47
48 if NACLSRPC 48 if NACLSRPC
49 # NOTE: we use --noirt to specify that private libraries should
50 # be used instead of the stable IRT interface.
51 NACLSRPCLIBS = -lsrpc -lplatform -limc -limc_syscalls -lgio -lpthread 49 NACLSRPCLIBS = -lsrpc -lplatform -limc -limc_syscalls -lgio -lpthread
52 NACLLDFLAGS = -Wl,--noirt
53 else 50 else
54 if LINUX 51 if LINUX
55 NACLLDFLAGS = -Wl,-rpath='$$ORIGIN/../lib' 52 NACLLDFLAGS = -Wl,-rpath='$$ORIGIN/../lib'
56 endif 53 endif
57 endif 54 endif
58 55
59 AM_YFLAGS = -d 56 AM_YFLAGS = -d
60 57
61 # Automake 1.10+ disables lex and yacc output file regeneration if 58 # Automake 1.10+ disables lex and yacc output file regeneration if
62 # maintainer mode is disabled. Avoid this. 59 # maintainer mode is disabled. Avoid this.
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 endif 368 endif
372 369
373 bootstrap-test-treehash-chunksize: ld1 ld4 370 bootstrap-test-treehash-chunksize: ld1 ld4
374 rm -f $@ 371 rm -f $@
375 echo "#!/bin/sh" > $@ 372 echo "#!/bin/sh" > $@
376 echo "cmp ld1 ld4 | grep ." >> $@ 373 echo "cmp ld1 ld4 | grep ." >> $@
377 chmod +x $@ 374 chmod +x $@
378 375
379 endif 376 endif
380 endif 377 endif
OLDNEW
« no previous file with comments | « no previous file | gold/Makefile.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698