Remove building llvm2ice.build_atts from Subzero build.

Makefile.standalone

 # The following variables will likely need to be modified, depending on where
 # and how you built LLVM & Clang. They can be overridden in a command-line
 # invocation of make, like:
 #
 #   make LLVM_SRC_PATH=<path> LLVM_BIN_PATH=<path> \
 #        LIBCXX_INSTALL_PATH=<path> CLANG_PATH=<path> ...
 #
 
 # LLVM_SRC_PATH is the path to the root of the checked out source code. This
 # directory should contain the configure script, the include/ and lib/
@@ skipping 98 matching lines @@
         IceTypeConverter.cpp \
         IceTypes.cpp \
         llvm2ice.cpp \
         PNaClTranslator.cpp
 
 OBJS=$(patsubst %.cpp, $(OBJDIR)/%.o, $(SRCS))
 
 # Keep all the first target so it's the default.
 all: $(OBJDIR)/llvm2ice make_symlink
 
-make_symlink: $(OBJDIR)/llvm2ice $(OBJDIR)/llvm2ice.build_atts
-        rm -rf llvm2ice llvm2ice.build_atts
+make_symlink: $(OBJDIR)/llvm2ice
+        rm -rf llvm2ice
         ln -s $(OBJDIR)/llvm2ice
-        ln -s $(OBJDIR)/llvm2ice.build_atts
+        # Build Attributes:
+        @$(OBJDIR)/llvm2ice --build-atts

[Jim Stichnoth, 2014/10/29 21:29:36]

This is done just to let the user know what the build-atts are?

How about ./llvm2ice instead, to "test" the new symlink?

[Karl, 2014/10/29 21:55:27]

Actually, it also verifies that the define flags are properly defined (this is
checked by llvm2ice), and generates an error if there is a problem.

Changed to use the new symlink.

 
 .PHONY: all make_symlink
 
 # TODO(kschimpf): Fix python scripts to directly get build attributes
 # rather than generating $(OBJDIR)/llvm2ice.build_atts.
 $(OBJDIR)/llvm2ice: $(OBJS)
         $(CXX) $(LDFLAGS) -o $@ $^ $(LLVM_LDFLAGS) -ldl \
                -Wl,-rpath=$(abspath $(LIBCXX_INSTALL_PATH)/lib)
-        $@ --build-atts > $@.build_atts
 
 # TODO: Be more precise than "*.h" here and elsewhere.
 $(OBJS): $(OBJDIR)/%.o: src/%.cpp src/*.h src/*.def
         $(CXX) -c $(CXXFLAGS) $< -o $@
 
 $(OBJS): | $(OBJDIR)
 
 $(OBJDIR):
         @mkdir -p $@
 
@@ skipping 17 matching lines @@
 ifeq (,$(wildcard /usr/lib/clang-format/clang-format-diff.py))
   CLANG_FORMAT_DIFF = clang-format-diff.py
 else
   CLANG_FORMAT_DIFF = /usr/lib/clang-format/clang-format-diff.py
 endif
 format-diff:
         git diff -U0 `git merge-base HEAD master` | \
         $(CLANG_FORMAT_DIFF) -p1 -style=LLVM -i
 
 clean:
-        rm -rf llvm2ice llvm2ice.build_atts *.o $(OBJDIR)
+        rm -rf llvm2ice *.o $(OBJDIR)
 
 clean-all: clean
         rm -rf build/