diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-22 12:19:21 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-22 12:19:21 +0000 |
| commit | f65e5121e2fb8374aaa0df4a0ab4768d6daaaab9 (patch) | |
| tree | 8881bec7c8534d931c4f6f40fc5ded9838fc75bf /nacl | |
| parent | a49be8a8e378a8b2820c7fdfde3b6a3afd688c7b (diff) | |
| download | ruby-f65e5121e2fb8374aaa0df4a0ab4768d6daaaab9.tar.gz | |
Fix PNaCl configure/link errors.
* configure.in (nacl_cv_cpu_nick): fix typo in PNaCl.
(XCFLAGS) Add -isystem flag to pnacl and nacl-newlib
(CXX): added
* nacl/GNUmakefile.in (CXX): Added
(PPROGRAM): Use clang++ instead of clang because libnacl_io
depends on c++ std lib.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48095 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'nacl')
| -rw-r--r-- | nacl/GNUmakefile.in | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/nacl/GNUmakefile.in b/nacl/GNUmakefile.in index e850ad258d..1fffcee898 100644 --- a/nacl/GNUmakefile.in +++ b/nacl/GNUmakefile.in @@ -7,12 +7,16 @@ include Makefile NACL_SDK_ROOT=@NACL_SDK_ROOT@ NACL_TOOLCHAIN=@NACL_TOOLCHAIN@ NACL_TOOLCHAIN_DIR=$(NACL_SDK_ROOT)/toolchain/$(NACL_TOOLCHAIN) +CXX=@CXX@ # Don't override CC/LD/etc if they are already set to absolute # paths (this is the case when building in the naclports tree). ifeq ($(dir $(CC)),./) CC:=$(NACL_TOOLCHAIN_DIR)/bin/$(CC) endif +ifeq ($(dir $(CXX)),./) +CXX:=$(NACL_TOOLCHAIN_DIR)/bin/$(CXX) +endif ifeq ($(dir $(LD)),./) LD:=$(NACL_TOOLCHAIN_DIR)/bin/$(LD) endif @@ -43,7 +47,7 @@ PPROGRAM_NMF=$(PPROGRAM:$(EXEEXT)=.nmf) GNUmakefile: $(srcdir)/nacl/GNUmakefile.in $(PPROGRAM): $(PROGRAM) pepper_main.$(OBJEXT) - $(Q)$(MAKE) $(MFLAGS) PROGRAM=$(PPROGRAM) MAINOBJ="pepper_main.$(OBJEXT)" LIBS="$(LIBS) $(PEPPER_LIBS)" program + $(Q)$(MAKE) $(MFLAGS) PROGRAM=$(PPROGRAM) MAINOBJ="pepper_main.$(OBJEXT)" LIBS="$(LIBS) $(PEPPER_LIBS)" CC="$(CXX)" program $(PROGRAM_NMF) $(PPROGRAM_NMF): $(@:.nmf=$(EXEEXT)) nacl/create_nmf.rb .PHONY: pprogram package show_naclflags |