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

Side by Side Diff: ports/pnacl/build.sh

Issue 1669063002: Add quotes in pnacl install step to avoid shell globing (Closed) Base URL: https://chromium.googlesource.com/webports.git@master
Patch Set: Created 4 years, 10 months 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 | 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 # Copyright (c) 2013 The Native Client Authors. All rights reserved. 1 # Copyright (c) 2013 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 EnableGlibcCompat 5 EnableGlibcCompat
6 EnableCliMain 6 EnableCliMain
7 7
8 PatchStep() { 8 PatchStep() {
9 DefaultPatchStep 9 DefaultPatchStep
10 MakeDir ${SRC_DIR}/toolchain_build/src 10 MakeDir ${SRC_DIR}/toolchain_build/src
(...skipping 169 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 LogExecute rm -f toolchain/bin/mipsel-* 180 LogExecute rm -f toolchain/bin/mipsel-*
181 LogExecute rm -f toolchain/lib/*.so 181 LogExecute rm -f toolchain/lib/*.so
182 } 182 }
183 183
184 InstallStep() { 184 InstallStep() {
185 local INSTALL_DIR=${DESTDIR}/${PREFIX}/pnacl 185 local INSTALL_DIR=${DESTDIR}/${PREFIX}/pnacl
186 Remove ${INSTALL_DIR}/ 186 Remove ${INSTALL_DIR}/
187 MakeDir ${INSTALL_DIR}/ 187 MakeDir ${INSTALL_DIR}/
188 188
189 LogExecute cp -r toolchain/* ${INSTALL_DIR} 189 LogExecute cp -r toolchain/* ${INSTALL_DIR}
190 for f in $(find ${INSTALL_DIR} -type l -name *-clang*${NACL_EXEEXT}); do 190 for f in $(find ${INSTALL_DIR} -type l -name "*-clang*${NACL_EXEEXT}"); do
191 # link to clang binary 191 # link to clang binary
192 Remove $f ${f%.*} 192 Remove $f ${f%.*}
193 LogExecute ln -s clang ${f%.*} 193 LogExecute ln -s clang ${f%.*}
194 done 194 done
195 for f in $(find ${INSTALL_DIR} -executable -type f -name *${NACL_EXEEXT}); do 195 for f in $(find ${INSTALL_DIR} -type f -name "*${NACL_EXEEXT}"); do
196 LogExecute mv $f ${f%.*} 196 LogExecute mv $f ${f%.*}
197 done 197 done
198 } 198 }
199 199
200 TestStep() { 200 TestStep() {
201 # Verify that binaries at least load under sel_ldr 201 # Verify that binaries at least load under sel_ldr
202 LogExecute toolchain/bin/le32-nacl-strings --version 202 LogExecute toolchain/bin/le32-nacl-strings --version
203 LogExecute toolchain/bin/arm-nacl-readelf --version 203 LogExecute toolchain/bin/arm-nacl-readelf --version
204 LogExecute toolchain/bin/x86_64-nacl-as --version 204 LogExecute toolchain/bin/x86_64-nacl-as --version
205 LogExecute toolchain/bin/clang --version 205 LogExecute toolchain/bin/clang --version
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 -L$PWD/toolchain/bin/../x86_64-nacl/usr/lib 242 -L$PWD/toolchain/bin/../x86_64-nacl/usr/lib
243 -L$PWD/toolchain/bin/../lib/clang/3.7.0/lib/x86_64-nacl 243 -L$PWD/toolchain/bin/../lib/clang/3.7.0/lib/x86_64-nacl
244 ./hello.o --start-group -lc -lgcc --as-needed -lgcc_eh --no-as-needed 244 ./hello.o --start-group -lc -lgcc --as-needed -lgcc_eh --no-as-needed
245 --end-group 245 --end-group
246 $PWD/toolchain/bin/../lib/clang/3.7.0/lib/x86_64-nacl/crtend.o 246 $PWD/toolchain/bin/../lib/clang/3.7.0/lib/x86_64-nacl/crtend.o
247 $PWD/toolchain/bin/../x86_64-nacl/lib/crtn.o 247 $PWD/toolchain/bin/../x86_64-nacl/lib/crtn.o
248 " 248 "
249 LogExecute $link_command 249 LogExecute $link_command
250 RunSelLdrCommand hello.nexe 250 RunSelLdrCommand hello.nexe
251 } 251 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698