Clean up clean and clarify XCODE flags.

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

diff --git a/UnixPkg/Sec/SecMain.inf b/UnixPkg/Sec/SecMain.inf
index 3bad28bf595712c78e08879b307dc7c4712f875a..890c2ea7ab5dc6e562cfca74d5145a54e1932a0c 100644 (file)
--- a/UnixPkg/Sec/SecMain.inf
+++ b/UnixPkg/Sec/SecMain.inf
@@ -96,7 +96,7 @@
 # Need to do this link via gcc and not ld as the pathing to libraries changes from OS version to OS version\r
 #\r
    XCODE:*_*_IA32_DLINK_PATH == gcc\r
-   XCODE:*_*_IA32_DLINK_FLAGS == -arch i386 -o $(BIN_DIR)/SecMain -L/usr/X11R6/lib -lXext -lX11 -lIOKit -framework Carbon              \r
+   XCODE:*_*_IA32_DLINK_FLAGS == -arch i386 -o $(BIN_DIR)/SecMain -L/usr/X11R6/lib -lXext -lX11 -framework IOKit -framework Carbon             \r
    XCODE:*_*_IA32_ASM_FLAGS == -arch i386 -g\r
 \r
    XCODE:*_*_X64_DLINK_PATH == gcc\r

diff --git a/UnixPkg/Xcode/xcode_project/XcodeBuild.sh b/UnixPkg/Xcode/xcode_project/XcodeBuild.sh
index e3827cec1f13e3e31e5d62d576966494fff3fb79..096233b60fe9d4f9c6f5995ab30481fd607cdbb2 100755 (executable)
--- a/UnixPkg/Xcode/xcode_project/XcodeBuild.sh
+++ b/UnixPkg/Xcode/xcode_project/XcodeBuild.sh
@@ -10,5 +10,4 @@ set -e
 # Source the workspace and set up the environment varaibles we need
 #
 cd ../..
-echo `pwd`
-./build.sh
+./build.sh $1 $2 $3 $4 $5 $6 $8

diff --git a/UnixPkg/build64.sh b/UnixPkg/build64.sh
index c80d29591d4f0dd4ee93e1bd55cabffdce0a2453..ce3a96fe6608738f6f5251cddf958314ba224f5b 100755 (executable)
--- a/UnixPkg/build64.sh
+++ b/UnixPkg/build64.sh
@@ -90,7 +90,18 @@ do
 
   if [[ $arg == cleanall ]]; then
     make -C $WORKSPACE/BaseTools clean  
+    build -p $WORKSPACE/UnixPkg/UnixPkgX64.dsc -a X64 -t $TARGET_TOOLS -D SEC_ONLY -n 3 clean
+    build -p $WORKSPACE/UnixPkg/UnixPkgX64.dsc -a X64 -t $UNIXPKG_TOOLS -n 3 clean
+    exit $?
+  fi
+
+  if [[ $arg == clean ]]; then
+    build -p $WORKSPACE/UnixPkg/UnixPkgX64.dsc -a X64 -t $TARGET_TOOLS -D SEC_ONLY -n 3 clean
+    build -p $WORKSPACE/UnixPkg/UnixPkgX64.dsc -a X64 -t $UNIXPKG_TOOLS -n 3 clean
+    exit $?
   fi
+  
+  
   if [[ $arg == shell ]]; then
     build -p $WORKSPACE/GccShellPkg/GccShellPkg.dsc -a X64 -t $UNIXPKG_TOOLS -n 3  $2 $3 $4 $5 $6 $7 $8
     exit $?