| OLD | NEW |
| 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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 endif | 67 endif |
| 68 endif | 68 endif |
| 69 | 69 |
| 70 ifeq ($(wildcard $(NACL_TOOLCHAIN)),) | 70 ifeq ($(wildcard $(NACL_TOOLCHAIN)),) |
| 71 $(error Cannot find Native Client toolchain in "${NACL_TOOLCHAIN}") | 71 $(error Cannot find Native Client toolchain in "${NACL_TOOLCHAIN}") |
| 72 endif | 72 endif |
| 73 | 73 |
| 74 # For mksnapshot host generation. | 74 # For mksnapshot host generation. |
| 75 GYPENV += host_os=${HOST_OS} | 75 GYPENV += host_os=${HOST_OS} |
| 76 | 76 |
| 77 # ICU doesn't support NaCl. |
| 78 GYPENV += v8_enable_i18n_support=0 |
| 79 |
| 77 NACL_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(NACL_ARCHES)) | 80 NACL_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(NACL_ARCHES)) |
| 78 .SECONDEXPANSION: | 81 .SECONDEXPANSION: |
| 79 # For some reason the $$(basename $$@) expansion didn't work here... | 82 # For some reason the $$(basename $$@) expansion didn't work here... |
| 80 $(NACL_BUILDS): $(NACL_MAKEFILES) | 83 $(NACL_BUILDS): $(NACL_MAKEFILES) |
| 81 @$(MAKE) -C "$(OUTDIR)" -f Makefile.$(basename $@) \ | 84 @$(MAKE) -C "$(OUTDIR)" -f Makefile.$(basename $@) \ |
| 82 CXX=${NACL_CXX} \ | 85 CXX=${NACL_CXX} \ |
| 83 LINK=${NACL_LINK} \ | 86 LINK=${NACL_LINK} \ |
| 84 BUILDTYPE=$(shell echo $(subst .,,$(suffix $@)) | \ | 87 BUILDTYPE=$(shell echo $(subst .,,$(suffix $@)) | \ |
| 85 python -c "print raw_input().capitalize()") \ | 88 python -c "print raw_input().capitalize()") \ |
| 86 builddir="$(shell pwd)/$(OUTDIR)/$@" | 89 builddir="$(shell pwd)/$(OUTDIR)/$@" |
| 87 | 90 |
| 88 # NACL GYP file generation targets. | 91 # NACL GYP file generation targets. |
| 89 $(NACL_MAKEFILES): | 92 $(NACL_MAKEFILES): |
| 90 @GYP_GENERATORS=make \ | 93 @GYP_GENERATORS=make \ |
| 91 GYP_DEFINES="${GYPENV}" \ | 94 GYP_DEFINES="${GYPENV}" \ |
| 92 CC=${NACL_CC} \ | 95 CC=${NACL_CC} \ |
| 93 CXX=${NACL_CXX} \ | 96 CXX=${NACL_CXX} \ |
| 94 PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \ | 97 PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(PYTHONPATH)" \ |
| 95 build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \ | 98 build/gyp/gyp --generator-output="${OUTDIR}" build/all.gyp \ |
| 96 -Ibuild/standalone.gypi --depth=. \ | 99 -Ibuild/standalone.gypi --depth=. \ |
| 97 -S.$(subst .,,$(suffix $@)) $(GYPFLAGS) \ | 100 -S.$(subst .,,$(suffix $@)) $(GYPFLAGS) \ |
| 98 -Dwno_array_bounds=-Wno-array-bounds | 101 -Dwno_array_bounds=-Wno-array-bounds |
| OLD | NEW |