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

Side by Side Diff: Makefile

Issue 19195003: Fix gyp_v8 to work with use_system_icu=1 (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: updates Created 7 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 | Makefile.android » ('j') | 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 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 native.clean: 345 native.clean:
346 rm -f $(OUTDIR)/Makefile.native 346 rm -f $(OUTDIR)/Makefile.native
347 rm -rf $(OUTDIR)/native 347 rm -rf $(OUTDIR)/native
348 find $(OUTDIR) -regex '.*\(host\|target\).native\.mk' -delete 348 find $(OUTDIR) -regex '.*\(host\|target\).native\.mk' -delete
349 349
350 clean: $(addsuffix .clean, $(ARCHES) $(ANDROID_ARCHES) $(NACL_ARCHES)) native.cl ean 350 clean: $(addsuffix .clean, $(ARCHES) $(ANDROID_ARCHES) $(NACL_ARCHES)) native.cl ean
351 351
352 # GYP file generation targets. 352 # GYP file generation targets.
353 OUT_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ARCHES)) 353 OUT_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(ARCHES))
354 $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE) 354 $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE)
355 PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \
355 GYP_GENERATORS=make \ 356 GYP_GENERATORS=make \
356 build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \ 357 build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
357 -Ibuild/standalone.gypi --depth=. \ 358 -Ibuild/standalone.gypi --depth=. \
358 -Dv8_target_arch=$(subst .,,$(suffix $@)) \ 359 -Dv8_target_arch=$(subst .,,$(suffix $@)) \
359 -S.$(subst .,,$(suffix $@)) $(GYPFLAGS) 360 -S.$(subst .,,$(suffix $@)) $(GYPFLAGS)
360 361
361 $(OUTDIR)/Makefile.native: $(GYPFILES) $(ENVFILE) 362 $(OUTDIR)/Makefile.native: $(GYPFILES) $(ENVFILE)
363 PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \
362 GYP_GENERATORS=make \ 364 GYP_GENERATORS=make \
363 build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \ 365 build/gyp/gyp --generator-output="$(OUTDIR)" build/all.gyp \
364 -Ibuild/standalone.gypi --depth=. -S.native $(GYPFLAGS) 366 -Ibuild/standalone.gypi --depth=. -S.native $(GYPFLAGS)
365 367
366 must-set-ANDROID_NDK_ROOT_OR_TOOLCHAIN: 368 must-set-ANDROID_NDK_ROOT_OR_TOOLCHAIN:
367 ifndef ANDROID_NDK_ROOT 369 ifndef ANDROID_NDK_ROOT
368 ifndef ANDROID_TOOLCHAIN 370 ifndef ANDROID_TOOLCHAIN
369 $(error ANDROID_NDK_ROOT or ANDROID_TOOLCHAIN must be set)) 371 $(error ANDROID_NDK_ROOT or ANDROID_TOOLCHAIN must be set))
370 endif 372 endif
371 endif 373 endif
(...skipping 23 matching lines...) Expand all
395 echo "CXX=$(CXX)" >> $(ENVFILE).new 397 echo "CXX=$(CXX)" >> $(ENVFILE).new
396 398
397 # Dependencies. 399 # Dependencies.
398 # Remember to keep these in sync with the DEPS file. 400 # Remember to keep these in sync with the DEPS file.
399 dependencies: 401 dependencies:
400 svn checkout --force http://gyp.googlecode.com/svn/trunk build/gyp \ 402 svn checkout --force http://gyp.googlecode.com/svn/trunk build/gyp \
401 --revision 1656 403 --revision 1656
402 svn checkout --force \ 404 svn checkout --force \
403 https://src.chromium.org/chrome/trunk/deps/third_party/icu46 \ 405 https://src.chromium.org/chrome/trunk/deps/third_party/icu46 \
404 third_party/icu --revision 210659 406 third_party/icu --revision 210659
OLDNEW
« no previous file with comments | « no previous file | Makefile.android » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698