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

Side by Side Diff: Makefile.nacl

Issue 16092004: Allow a relativ path to the NaCl SDK when building (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
« 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 # 1 #
2 # Copyright 2013 the V8 project authors. All rights reserved. 2 # Copyright 2013 the V8 project authors. All rights reserved.
3 # Redistribution and use in source and binary forms, with or without 3 # Redistribution and use in source and binary forms, with or without
4 # modification, are permitted provided that the following conditions are 4 # modification, are permitted provided that the following conditions are
5 # met: 5 # met:
6 # 6 #
7 # * Redistributions of source code must retain the above copyright 7 # * Redistributions of source code must retain the above copyright
8 # notice, this list of conditions and the following disclaimer. 8 # notice, this list of conditions and the following disclaimer.
9 # * Redistributions in binary form must reproduce the above 9 # * Redistributions in binary form must reproduce the above
10 # copyright notice, this list of conditions and the following 10 # copyright notice, this list of conditions and the following
(...skipping 28 matching lines...) Expand all
39 ifeq ($(HOST_OS), linux) 39 ifeq ($(HOST_OS), linux)
40 TOOLCHAIN_DIR = linux_x86_glibc 40 TOOLCHAIN_DIR = linux_x86_glibc
41 else 41 else
42 ifeq ($(HOST_OS), mac) 42 ifeq ($(HOST_OS), mac)
43 TOOLCHAIN_DIR = mac_x86_glibc 43 TOOLCHAIN_DIR = mac_x86_glibc
44 else 44 else
45 $(error Host platform "${HOST_OS}" is not supported) 45 $(error Host platform "${HOST_OS}" is not supported)
46 endif 46 endif
47 endif 47 endif
48 48
49 TOOLCHAIN_PATH = ${NACL_SDK_ROOT}/toolchain 49 TOOLCHAIN_PATH = $(realpath ${NACL_SDK_ROOT}/toolchain)
50 NACL_TOOLCHAIN ?= ${TOOLCHAIN_PATH}/${TOOLCHAIN_DIR} 50 NACL_TOOLCHAIN ?= ${TOOLCHAIN_PATH}/${TOOLCHAIN_DIR}
51 51
52 ifeq ($(ARCH), nacl_ia32) 52 ifeq ($(ARCH), nacl_ia32)
53 GYPENV = nacl_target_arch=nacl_ia32 v8_target_arch=arm v8_host_arch=ia32 53 GYPENV = nacl_target_arch=nacl_ia32 v8_target_arch=arm v8_host_arch=ia32
54 TOOLCHAIN_ARCH = x86-4.4 54 TOOLCHAIN_ARCH = x86-4.4
55 NACL_CC = "$(NACL_TOOLCHAIN)/bin/i686-nacl-gcc" 55 NACL_CC = "$(NACL_TOOLCHAIN)/bin/i686-nacl-gcc"
56 NACL_CXX = "$(NACL_TOOLCHAIN)/bin/i686-nacl-g++" 56 NACL_CXX = "$(NACL_TOOLCHAIN)/bin/i686-nacl-g++"
57 NACL_LINK = "$(NACL_TOOLCHAIN)/bin/i686-nacl-g++" 57 NACL_LINK = "$(NACL_TOOLCHAIN)/bin/i686-nacl-g++"
58 else 58 else
59 ifeq ($(ARCH), nacl_x64) 59 ifeq ($(ARCH), nacl_x64)
(...skipping 27 matching lines...) Expand all
87 87
88 # NACL GYP file generation targets. 88 # NACL GYP file generation targets.
89 $(NACL_MAKEFILES): 89 $(NACL_MAKEFILES):
90 @GYP_GENERATORS=make \ 90 @GYP_GENERATORS=make \
91 GYP_DEFINES="${GYPENV}" \ 91 GYP_DEFINES="${GYPENV}" \
92 CC=${NACL_CC} \ 92 CC=${NACL_CC} \
93 CXX=${NACL_CXX} \ 93 CXX=${NACL_CXX} \
94 build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \ 94 build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \
95 -Ibuild/standalone.gypi --depth=. \ 95 -Ibuild/standalone.gypi --depth=. \
96 -S.$(subst .,,$(suffix $@)) $(GYPFLAGS) 96 -S.$(subst .,,$(suffix $@)) $(GYPFLAGS)
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