Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 Loading... | |
| 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 | 49 NACLSRPCLIBS = -lsrpc -lplatform -limc -limc_syscalls -lgio |
| 50 # be used instead of the stable IRT interface. | |
| 51 NACLSRPCLIBS = -lsrpc -lplatform -limc -limc_syscalls -lgio -lpthread | |
|
Mark Seaborn
2014/11/07 02:36:38
Does gold use libpthread? I think libsrpc does, a
jvoung (off chromium)
2014/11/07 16:24:06
Okay, no harm in keeping it here for now. Done.
| |
| 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 Loading... | |
| 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 |
| OLD | NEW |