| OLD | NEW |
|---|
| 1 # Copyright (c) 2014 The Native Client Authors. All rights reserved. | 1 # Copyright (c) 2014 The Native Client Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 EXTRA_CONFIGURE_ARGS+=" --datarootdir=/share" | 5 EXTRA_CONFIGURE_ARGS+=" --datarootdir=/share" |
| 6 | 6 |
| 7 NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main" | 7 NACLPORTS_CPPFLAGS+=" -Dmain=nacl_main" |
| 8 export LIBS+=" -Wl,--undefined=nacl_main ${NACL_CLI_MAIN_LIB} \ | 8 export LIBS+=" -Wl,--undefined=nacl_main ${NACL_CLI_MAIN_LIB} \ |
| 9 -lX11 -lxcb -lXau \ | 9 -lX11 -lxcb -lXau \ |
| 10 -lnacl_spawn \ | |
| 11 -lppapi_simple -ltar \ | 10 -lppapi_simple -ltar \ |
| 12 -lnacl_io -lppapi -lppapi_cpp -l${NACL_CPP_LIB}" | 11 -lnacl_io -lppapi -lppapi_cpp -l${NACL_CPP_LIB}" |
| 13 | 12 |
| 14 if [ "${NACL_LIBC}" = "newlib" ]; then | 13 if [ "${NACL_LIBC}" = "newlib" ]; then |
| 15 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat" | 14 NACLPORTS_CPPFLAGS+=" -I${NACLPORTS_INCLUDE}/glibc-compat" |
| 16 export LIBS+=" -lglibc-compat" | 15 export LIBS+=" -lglibc-compat" |
| 17 fi | 16 fi |
| 18 | 17 |
| 19 InstallStep() { | 18 InstallStep() { |
| 20 return | 19 return |
| 21 } | 20 } |
| 22 | 21 |
| 23 PublishStep() { | 22 PublishStep() { |
| 24 PublishByArchForDevEnv | 23 PublishByArchForDevEnv |
| 25 } | 24 } |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 907563002:
Simplify cli_main (Closed)
Base URL: https://chromium.googlesource.com/external/naclports.git@master