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

Side by Side Diff: gold/Makefile.in

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: 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
« gold/Makefile.am ('K') | « gold/Makefile.am ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Makefile.in generated by automake 1.11.1 from Makefile.am. 1 # Makefile.in generated by automake 1.11.1 from Makefile.am.
2 # @configure_input@ 2 # @configure_input@
3 3
4 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 4 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, 5 # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
6 # Inc. 6 # Inc.
7 # This Makefile.in is free software; the Free Software Foundation 7 # This Makefile.in is free software; the Free Software Foundation
8 # gives unlimited permission to copy and/or distribute it, 8 # gives unlimited permission to copy and/or distribute it,
9 # with or without modifications, as long as this notice is preserved. 9 # with or without modifications, as long as this notice is preserved.
10 10
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 AM_CPPFLAGS = \ 417 AM_CPPFLAGS = \
418 -I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../elfcpp \ 418 -I$(srcdir) -I$(srcdir)/../include -I$(srcdir)/../elfcpp \
419 -DLOCALEDIR="\"$(datadir)/locale\"" \ 419 -DLOCALEDIR="\"$(datadir)/locale\"" \
420 -DBINDIR="\"$(bindir)\"" -DTOOLBINDIR="\"$(tooldir)/bin\"" \ 420 -DBINDIR="\"$(bindir)\"" -DTOOLBINDIR="\"$(tooldir)/bin\"" \
421 -DTOOLLIBDIR="\"$(tooldir)/lib\"" @INCINTL@ 421 -DTOOLLIBDIR="\"$(tooldir)/lib\"" @INCINTL@
422 422
423 LIBIBERTY = ../libiberty/libiberty.a 423 LIBIBERTY = ../libiberty/libiberty.a
424 @PLUGINS_TRUE@LIBDL = @DLOPEN_LIBS@ 424 @PLUGINS_TRUE@LIBDL = @DLOPEN_LIBS@
425 @THREADS_TRUE@THREADSLIB = -lpthread 425 @THREADS_TRUE@THREADSLIB = -lpthread
426 426
427 # NOTE: we use --noirt to specify that private libraries should 427 @NACLSRPC_TRUE@NACLSRPCLIBS = -lsrpc -lplatform -limc -limc_syscalls -lgio
428 # be used instead of the stable IRT interface.
429 @NACLSRPC_TRUE@NACLSRPCLIBS = -lsrpc -lplatform -limc -limc_syscalls -lgio -lpth read
Mark Seaborn 2014/11/07 02:36:38 Same with this one
jvoung (off chromium) 2014/11/07 16:24:06 Done.
430 @LINUX_TRUE@@NACLSRPC_FALSE@NACLLDFLAGS = -Wl,-rpath='$$ORIGIN/../lib' 428 @LINUX_TRUE@@NACLSRPC_FALSE@NACLLDFLAGS = -Wl,-rpath='$$ORIGIN/../lib'
431 @NACLSRPC_TRUE@NACLLDFLAGS = -Wl,--noirt
432 AM_YFLAGS = -d 429 AM_YFLAGS = -d
433 430
434 # Automake 1.10+ disables lex and yacc output file regeneration if 431 # Automake 1.10+ disables lex and yacc output file regeneration if
435 # maintainer mode is disabled. Avoid this. 432 # maintainer mode is disabled. Avoid this.
436 am__skiplex = 433 am__skiplex =
437 am__skipyacc = 434 am__skipyacc =
438 noinst_LIBRARIES = libgold.a 435 noinst_LIBRARIES = libgold.a
439 CCFILES = \ 436 CCFILES = \
440 archive.cc \ 437 archive.cc \
441 attributes.cc \ 438 attributes.cc \
(...skipping 947 matching lines...) Expand 10 before | Expand all | Expand 10 after
1389 1386
1390 @GCC_TRUE@@NATIVE_LINKER_TRUE@bootstrap-test-treehash-chunksize: ld1 ld4 1387 @GCC_TRUE@@NATIVE_LINKER_TRUE@bootstrap-test-treehash-chunksize: ld1 ld4
1391 @GCC_TRUE@@NATIVE_LINKER_TRUE@ rm -f $@ 1388 @GCC_TRUE@@NATIVE_LINKER_TRUE@ rm -f $@
1392 @GCC_TRUE@@NATIVE_LINKER_TRUE@ echo "#!/bin/sh" > $@ 1389 @GCC_TRUE@@NATIVE_LINKER_TRUE@ echo "#!/bin/sh" > $@
1393 @GCC_TRUE@@NATIVE_LINKER_TRUE@ echo "cmp ld1 ld4 | grep ." >> $@ 1390 @GCC_TRUE@@NATIVE_LINKER_TRUE@ echo "cmp ld1 ld4 | grep ." >> $@
1394 @GCC_TRUE@@NATIVE_LINKER_TRUE@ chmod +x $@ 1391 @GCC_TRUE@@NATIVE_LINKER_TRUE@ chmod +x $@
1395 1392
1396 # Tell versions [3.59,3.63) of GNU make to not export all variables. 1393 # Tell versions [3.59,3.63) of GNU make to not export all variables.
1397 # Otherwise a system limit (for SysV at least) may be exceeded. 1394 # Otherwise a system limit (for SysV at least) may be exceeded.
1398 .NOEXPORT: 1395 .NOEXPORT:
OLDNEW
« gold/Makefile.am ('K') | « gold/Makefile.am ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698