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

Side by Side Diff: platform_tools/nacl/nacl_make

Issue 171233015: Fix NaCl build for pepper_32 (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 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 | « gyp/common_conditions.gypi ('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 #!/bin/bash 1 #!/bin/bash
2 2
3 function exportVar { 3 function exportVar {
4 NAME=$1 4 NAME=$1
5 VALUE=$2 5 VALUE=$2
6 echo export $NAME=\"$VALUE\" 6 echo export $NAME=\"$VALUE\"
7 export $NAME="$VALUE" 7 export $NAME="$VALUE"
8 } 8 }
9 9
10 function setenv { 10 function setenv {
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 exportVar NACLRANLIB ${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-ranlib 57 exportVar NACLRANLIB ${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-ranlib
58 exportVar NACLLD ${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-ld 58 exportVar NACLLD ${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-ld
59 exportVar NACLSTRINGS ${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-strings 59 exportVar NACLSTRINGS ${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-strings
60 exportVar NACLSTRIP ${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-strip 60 exportVar NACLSTRIP ${NACL_BIN_PATH}/${NACL_CROSS_PREFIX}-strip
61 61
62 exportVar CC "${NACLCC}" 62 exportVar CC "${NACLCC}"
63 exportVar CXX "${NACLCXX}" 63 exportVar CXX "${NACLCXX}"
64 exportVar AR "${NACLAR}" 64 exportVar AR "${NACLAR}"
65 exportVar RANLIB "${NACLRANLIB}" 65 exportVar RANLIB "${NACLRANLIB}"
66 exportVar PATH ${NACL_BIN_PATH}:${PATH}; 66 exportVar PATH ${NACL_BIN_PATH}:${PATH};
67 67 exportVar C_INCLUDE_PATH "${NACL_SDK_ROOT}/include:${NACL_SDK_ROOT}/ports/incl ude:${C_INCLUDE_PATH}"
68 exportVar GYP_DEFINES "skia_os=nacl skia_arch_width=${ARCH_WIDTH}" 68 exportVar CPLUS_INCLUDE_PATH "${NACL_SDK_ROOT}/include:${NACL_SDK_ROOT}/ports/ include:${CPLUS_INCLUDE_PATH}"
69 exportVar GYP_DEFINES "skia_os=nacl skia_gpu=0 skia_arch_width=${ARCH_WIDTH}"
69 } 70 }
70 71
71 function build { 72 function build {
72 if [ -z "$1" ]; then 73 if [ -z "$1" ]; then
73 echo "ERROR: build() requires one argument." 74 echo "ERROR: build() requires one argument."
74 exit 1 75 exit 1
75 fi 76 fi
76 setenv $1 77 setenv $1
77 78
78 export SKIA_OUT=out/nacl$1 79 export SKIA_OUT=out/nacl$1
(...skipping 23 matching lines...) Expand all
102 echo "Unable to find ccache!" 103 echo "Unable to find ccache!"
103 exit 1 104 exit 1
104 fi 105 fi
105 fi 106 fi
106 107
107 build 32 && \ 108 build 32 && \
108 build 64 && \ 109 build 64 && \
109 if ! [ -L platform_tools/nacl/out ]; then 110 if ! [ -L platform_tools/nacl/out ]; then
110 ln -s ../../out platform_tools/nacl 111 ln -s ../../out platform_tools/nacl
111 fi 112 fi
OLDNEW
« no previous file with comments | « gyp/common_conditions.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698