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

Side by Side Diff: Makefile

Issue 405113002: Add CXX cross-compile detection into Makefile after it was removed from gyp. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 5 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 # Copyright 2012 the V8 project authors. All rights reserved. 1 # Copyright 2012 the V8 project authors. All rights reserved.
2 # Redistribution and use in source and binary forms, with or without 2 # Redistribution and use in source and binary forms, with or without
3 # modification, are permitted provided that the following conditions are 3 # modification, are permitted provided that the following conditions are
4 # met: 4 # met:
5 # 5 #
6 # * Redistributions of source code must retain the above copyright 6 # * Redistributions of source code must retain the above copyright
7 # notice, this list of conditions and the following disclaimer. 7 # notice, this list of conditions and the following disclaimer.
8 # * Redistributions in binary form must reproduce the above 8 # * Redistributions in binary form must reproduce the above
9 # copyright notice, this list of conditions and the following 9 # copyright notice, this list of conditions and the following
10 # disclaimer in the documentation and/or other materials provided 10 # disclaimer in the documentation and/or other materials provided
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
392 native.clean: 392 native.clean:
393 rm -f $(OUTDIR)/Makefile.native 393 rm -f $(OUTDIR)/Makefile.native
394 rm -rf $(OUTDIR)/native 394 rm -rf $(OUTDIR)/native
395 find $(OUTDIR) -regex '.*\(host\|target\)\.native\.mk' -delete 395 find $(OUTDIR) -regex '.*\(host\|target\)\.native\.mk' -delete
396 396
397 clean: $(addsuffix .clean, $(ARCHES) $(ANDROID_ARCHES) $(NACL_ARCHES)) native.cl ean gtags.clean 397 clean: $(addsuffix .clean, $(ARCHES) $(ANDROID_ARCHES) $(NACL_ARCHES)) native.cl ean gtags.clean
398 398
399 # GYP file generation targets. 399 # GYP file generation targets.
400 OUT_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(BUILDS)) 400 OUT_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(BUILDS))
401 $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE) 401 $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE)
402 $(eval CXX_TARGET_ARCH:=$(shell $(CXX) -v 2>&1 | grep ^Target: | \
403 cut -f 2 -d " " | cut -f 1 -d "-" ))
404 $(eval V8_TARGET_ARCH:=$(subst .,,$(suffix $(basename $@))))
402 PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/build: $(PYTHONPATH):$(shell pwd)/build/gyp/pylib:$(PYTHONPATH)" \ 405 PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/build: $(PYTHONPATH):$(shell pwd)/build/gyp/pylib:$(PYTHONPATH)" \
403 GYP_GENERATORS=make \ 406 GYP_GENERATORS=make \
404 build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \ 407 build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
405 -Ibuild/standalone.gypi --depth=. \ 408 -Ibuild/standalone.gypi --depth=. \
406 » -Dv8_target_arch=$(subst .,,$(suffix $(basename $@))) \ 409 » -Dv8_target_arch=$(V8_TARGET_ARCH) \
410 » $(if $(filter $(CXX_TARGET_ARCH),$(V8_TARGET_ARCH)), \
411 » -Dtarget_arch=$(CXX_TARGET_ARCH),) \
407 $(if $(findstring optdebug,$@),-Dv8_optimized_debug=2,) \ 412 $(if $(findstring optdebug,$@),-Dv8_optimized_debug=2,) \
408 -S$(suffix $(basename $@))$(suffix $@) $(GYPFLAGS) 413 -S$(suffix $(basename $@))$(suffix $@) $(GYPFLAGS)
409 414
410 $(OUTDIR)/Makefile.native: $(GYPFILES) $(ENVFILE) 415 $(OUTDIR)/Makefile.native: $(GYPFILES) $(ENVFILE)
411 PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/build: $(PYTHONPATH):$(shell pwd)/build/gyp/pylib:$(PYTHONPATH)" \ 416 PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/build: $(PYTHONPATH):$(shell pwd)/build/gyp/pylib:$(PYTHONPATH)" \
412 GYP_GENERATORS=make \ 417 GYP_GENERATORS=make \
413 build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \ 418 build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
414 -Ibuild/standalone.gypi --depth=. -S.native $(GYPFLAGS) 419 -Ibuild/standalone.gypi --depth=. -S.native $(GYPFLAGS)
415 420
416 must-set-ANDROID_NDK_ROOT_OR_TOOLCHAIN: 421 must-set-ANDROID_NDK_ROOT_OR_TOOLCHAIN:
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 builddeps: 473 builddeps:
469 svn checkout --force http://gyp.googlecode.com/svn/trunk build/gyp \ 474 svn checkout --force http://gyp.googlecode.com/svn/trunk build/gyp \
470 --revision 1831 475 --revision 1831
471 svn checkout --force \ 476 svn checkout --force \
472 https://src.chromium.org/chrome/trunk/deps/third_party/icu46 \ 477 https://src.chromium.org/chrome/trunk/deps/third_party/icu46 \
473 third_party/icu --revision 258359 478 third_party/icu --revision 258359
474 479
475 dependencies: builddeps 480 dependencies: builddeps
476 # The spec is a copy of the hooks in v8's DEPS file. 481 # The spec is a copy of the hooks in v8's DEPS file.
477 gclient sync -r fb782d4369d5ae04f17a2fceef7de5a63e50f07b --spec="solutio ns = [{u'managed': False, u'name': u'buildtools', u'url': u'https://chromium.goo glesource.com/chromium/buildtools.git', u'custom_deps': {}, u'custom_hooks': [{u 'name': u'clang_format_win',u'pattern': u'.',u'action': [u'download_from_google_ storage',u'--no_resume',u'--platform=win32',u'--no_auth',u'--bucket',u'chromium- clang-format',u'-s',u'buildtools/win/clang-format.exe.sha1']},{u'name': u'clang_ format_mac',u'pattern': u'.',u'action': [u'download_from_google_storage',u'--no_ resume',u'--platform=darwin',u'--no_auth',u'--bucket',u'chromium-clang-format',u '-s',u'buildtools/mac/clang-format.sha1']},{u'name': u'clang_format_linux',u'pat tern': u'.',u'action': [u'download_from_google_storage',u'--no_resume',u'--platf orm=linux*',u'--no_auth',u'--bucket',u'chromium-clang-format',u'-s',u'buildtools /linux64/clang-format.sha1']}],u'deps_file': u'.DEPS.git', u'safesync_url': u''} ]" 482 gclient sync -r fb782d4369d5ae04f17a2fceef7de5a63e50f07b --spec="solutio ns = [{u'managed': False, u'name': u'buildtools', u'url': u'https://chromium.goo glesource.com/chromium/buildtools.git', u'custom_deps': {}, u'custom_hooks': [{u 'name': u'clang_format_win',u'pattern': u'.',u'action': [u'download_from_google_ storage',u'--no_resume',u'--platform=win32',u'--no_auth',u'--bucket',u'chromium- clang-format',u'-s',u'buildtools/win/clang-format.exe.sha1']},{u'name': u'clang_ format_mac',u'pattern': u'.',u'action': [u'download_from_google_storage',u'--no_ resume',u'--platform=darwin',u'--no_auth',u'--bucket',u'chromium-clang-format',u '-s',u'buildtools/mac/clang-format.sha1']},{u'name': u'clang_format_linux',u'pat tern': u'.',u'action': [u'download_from_google_storage',u'--no_resume',u'--platf orm=linux*',u'--no_auth',u'--bucket',u'chromium-clang-format',u'-s',u'buildtools /linux64/clang-format.sha1']}],u'deps_file': u'.DEPS.git', u'safesync_url': u''} ]"
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