Fix makefile's parameter bug for OSX building.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1184 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Source/TianoTools/Pccts/antlr/build.xml b/Tools/Source/TianoTools/Pccts/antlr/build.xml
index 6f4a9179e28a6c970d0e9ec10082dfe1c9805f08..dfc1455409cff90d5b6f78beaa2fa934664e18f1 100644 (file)
--- a/Tools/Source/TianoTools/Pccts/antlr/build.xml
+++ b/Tools/Source/TianoTools/Pccts/antlr/build.xml
@@ -57,7 +57,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         <istrue value="${gcc}"/>\r
         <then>\r
            <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="make" failonerror="TRUE">\r
         <istrue value="${gcc}"/>\r
         <then>\r
            <exec dir="${PACKAGE_DIR}/Pccts/antlr" executable="make" failonerror="TRUE">\r

-                 <arg line="-f makefile"/>\r
+                 <arg line="-f makefile BIN_DIR=${BIN_DIR}"/>\r

                </exec>\r
         </then>\r
                  </elseif>\r
                </exec>\r
         </then>\r
                  </elseif>\r

diff --git a/Tools/Source/TianoTools/Pccts/antlr/makefile b/Tools/Source/TianoTools/Pccts/antlr/makefile
index ab64fc6123bbb2efe24559d4f3ce55ce13fcb516..2aa6cdfc34ae8efc4fd3d92ea3acd21d43624cc8 100644 (file)
--- a/Tools/Source/TianoTools/Pccts/antlr/makefile
+++ b/Tools/Source/TianoTools/Pccts/antlr/makefile
@@ -179,7 +179,7 @@ OBJ=antlr.o scan.o err.o bits.o build.o fset2.o fset.o gen.o  \
         globals.o hash.o lex.o main.o misc.o set.o pred.o egman.o mrhoist.o fcache.o\r
 \r
 antlr : $(OBJ) $(SRC)\r
         globals.o hash.o lex.o main.o misc.o set.o pred.o egman.o mrhoist.o fcache.o\r
 \r
 antlr : $(OBJ) $(SRC)\r

-               $(CC) $(CFLAGS) -o ${PACKAGE_DIR}/antlr $(OBJ)\r
+               $(CC) $(CFLAGS) -o $(BIN_DIR)/antlr $(OBJ)\r

 \r
 # what files does PCCTS generate (both ANTLR and DLG)\r
 PCCTS_GEN=antlr.c scan.c err.c tokens.h mode.h parser.dlg stdpccts.h remap.h\r
 \r
 # what files does PCCTS generate (both ANTLR and DLG)\r
 PCCTS_GEN=antlr.c scan.c err.c tokens.h mode.h parser.dlg stdpccts.h remap.h\r

diff --git a/Tools/Source/TianoTools/Pccts/dlg/build.xml b/Tools/Source/TianoTools/Pccts/dlg/build.xml
index 89e7aaa22eb9d7a17f798c85b9326d557176a606..4195950c7b3447695345c01af09882aaa99d9ee2 100644 (file)
--- a/Tools/Source/TianoTools/Pccts/dlg/build.xml
+++ b/Tools/Source/TianoTools/Pccts/dlg/build.xml
@@ -59,7 +59,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <equals arg1="${ToolChain}" arg2="gcc"/>\r
                        <then>\r
          <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="make" failonerror="TRUE">\r
       <equals arg1="${ToolChain}" arg2="gcc"/>\r
                        <then>\r
          <exec dir="${PACKAGE_DIR}/Pccts/dlg" executable="make" failonerror="TRUE">\r

-                 <arg line="-f makefile"/>\r
+                 <arg line="-f makefile BIN_DIR=${BIN_DIR}"/>\r

                </exec>\r
                  </then>\r
                </elseif>\r
                </exec>\r
                  </then>\r
                </elseif>\r