[Vm-dev] [commit][3494] Fix the GdbARMPlugin build on Mac OS X 10.9/xcode 6.x

commits at squeakvm.org commits at squeakvm.org
Thu Nov 12 03:12:37 UTC 2015


Revision: 3494
Author:   eliot
Date:     2015-11-11 19:12:34 -0800 (Wed, 11 Nov 2015)
Log Message:
-----------
Fix the GdbARMPlugin build on Mac OS X 10.9/xcode 6.x

Modified Paths:
--------------
    branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj

Removed Paths:
-------------
    branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin/build/

Modified: branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj
===================================================================
--- branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj	2015-11-12 02:18:21 UTC (rev 3493)
+++ branches/Cog/build.macos32x86/squeak.cog.spur/GdbARMPlugin/GdbARMPlugin.xcodeproj/project.pbxproj	2015-11-12 03:12:34 UTC (rev 3494)
@@ -13,7 +13,8 @@
 		732788241AB7C73500BE5008 /* environ.c in Sources */ = {isa = PBXBuildFile; fileRef = 732787F11AB7A12A00BE5008 /* environ.c */; };
 		737482B30EE7339F004E10F8 /* libopcodes.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737482B20EE7339F004E10F8 /* libopcodes.a */; };
 		737482B50EE733BD004E10F8 /* libsim.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737482B40EE733BD004E10F8 /* libsim.a */; };
-		737482B70EE7343B004E10F8 /* sqGdbARMPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 737482B60EE7343B004E10F8 /* sqGdbARMPlugin.c */; settings = {COMPILER_FLAGS = "-I../../../processors/ARM/mac/gdb-7.10/include -I../../../processors/ARM/mac/gdb-7.10/sim/arm -I../../../processors/ARM/mac/gdb-7.10/bfd -I../../gdbarm32/opcodes -I../../gdbarm32/bfd"; }; };
+		737482B70EE7343B004E10F8 /* sqGdbARMPlugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 737482B60EE7343B004E10F8 /* sqGdbARMPlugin.c */; settings = {COMPILER_FLAGS = "-I../../../processors/ARM/gdb-7.10/include -I../../../processors/ARM/gdb-7.10/sim/arm -I../../../processors/ARM/gdb-7.10/bfd -I../../gdbarm32/bfd"; }; };
+		73A487F71BF43A8500A1166F /* libz.1.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 73A487F61BF43A8500A1166F /* libz.1.dylib */; };
 		8D01CCCE0486CAD60068D4B7 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */; };
 /* End PBXBuildFile section */
 
@@ -22,11 +23,12 @@
 		73020E8C0EE714E60021D217 /* GdbARMPlugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = GdbARMPlugin.c; path = ../../../src/plugins/GdbARMPlugin/GdbARMPlugin.c; sourceTree = SOURCE_ROOT; };
 		73020E8E0EE7158C0021D217 /* GdbARMPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = GdbARMPlugin.h; path = ../../../platforms/Cross/plugins/GdbARMPlugin/GdbARMPlugin.h; sourceTree = SOURCE_ROOT; };
 		732787F11AB7A12A00BE5008 /* environ.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = environ.c; path = "../../../platforms/Mac OS/plugins/GdbARMPlugin/environ.c"; sourceTree = SOURCE_ROOT; };
-		732787F51AB7A40100BE5008 /* libiberty.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libiberty.a; path = "../../gdbarm32/libiberty/libiberty.a"; sourceTree = SOURCE_ROOT; };
-		737482B20EE7339F004E10F8 /* libopcodes.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopcodes.a; path = "../../gdbarm32/opcodes/libopcodes.a"; sourceTree = SOURCE_ROOT; };
-		737482B40EE733BD004E10F8 /* libsim.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsim.a; path = "../../gdbarm32/sim/arm/libsim.a"; sourceTree = SOURCE_ROOT; };
+		732787F51AB7A40100BE5008 /* libiberty.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libiberty.a; path = ../../gdbarm32/libiberty/libiberty.a; sourceTree = SOURCE_ROOT; };
+		737482B20EE7339F004E10F8 /* libopcodes.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopcodes.a; path = ../../gdbarm32/opcodes/libopcodes.a; sourceTree = SOURCE_ROOT; };
+		737482B40EE733BD004E10F8 /* libsim.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsim.a; path = ../../gdbarm32/sim/arm/libsim.a; sourceTree = SOURCE_ROOT; };
 		737482B60EE7343B004E10F8 /* sqGdbARMPlugin.c */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.c; fileEncoding = 30; name = sqGdbARMPlugin.c; path = ../../../platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c; sourceTree = SOURCE_ROOT; };
-		73ADAA901AB79ED50085DAA8 /* libbfd.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbfd.a; path = "../../gdbarm32/bfd/libbfd.a"; sourceTree = SOURCE_ROOT; };
+		73A487F61BF43A8500A1166F /* libz.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.1.dylib; path = /usr/lib/libz.1.dylib; sourceTree = "<absolute>"; };
+		73ADAA901AB79ED50085DAA8 /* libbfd.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libbfd.a; path = ../../gdbarm32/bfd/libbfd.a; sourceTree = SOURCE_ROOT; };
 		8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8D01CCD20486CAD60068D4B7 /* GdbARMPlugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GdbARMPlugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
 		DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../../spursrc/vm/interp.h; sourceTree = SOURCE_ROOT; };
@@ -47,6 +49,7 @@
 				737482B50EE733BD004E10F8 /* libsim.a in Frameworks */,
 				732787F61AB7A40100BE5008 /* libiberty.a in Frameworks */,
 				732788161AB7BDAC00BE5008 /* libbfd.a in Frameworks */,
+				73A487F71BF43A8500A1166F /* libz.1.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -71,6 +74,7 @@
 			isa = PBXGroup;
 			children = (
 				08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */,
+				73A487F61BF43A8500A1166F /* libz.1.dylib */,
 			);
 			name = "External Frameworks and Libraries";
 			sourceTree = "<group>";
@@ -196,11 +200,11 @@
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)",
 					"$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)",
 				);
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../../processors/ARM/mac/gdb-7.6/opcodes\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../../processors/ARM/mac/gdb-7.6/sim/arm\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/bfd\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/libiberty\"";
-				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../../processors/ARM/mac/binutils-2.25/bfd\"";
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = ../../gdbarm32/opcodes;
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = ../../gdbarm32/sim/arm;
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = ../../gdbarm32/bfd;
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = ../../gdbarm32/libiberty;
+				LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = ../../gdbarm32/bfd;
 				PRODUCT_NAME = GdbARMPlugin;
 				WRAPPER_EXTENSION = bundle;
 				ZERO_LINK = YES;
@@ -237,6 +241,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
 				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
 				CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)";
 				COPY_PHASE_STRIP = NO;
@@ -245,9 +251,10 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				PREBINDING = NO;
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
-				SDKROOT = /Developer/SDKs/MacOSX10.6.sdk;
+				SDKROOT = "";
 				STRIP_INSTALLED_PRODUCT = NO;
 				USER_HEADER_SEARCH_PATHS = "";
 				USE_HEADERMAP = NO;
@@ -258,6 +265,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = YES;
+				ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+				ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
 				CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)";
 				CONFIGURATION_TEMP_DIR = "$(PROJECT_TEMP_DIR)/$(CONFIGURATION)";
 				COPY_PHASE_STRIP = NO;
@@ -265,9 +274,10 @@
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = /Developer/Headers/FlatCarbon;
+				MACOSX_DEPLOYMENT_TARGET = 10.6;
 				PREBINDING = NO;
 				PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO;
-				SDKROOT = /Developer/SDKs/MacOSX10.6.sdk;
+				SDKROOT = "";
 				USER_HEADER_SEARCH_PATHS = "";
 				USE_HEADERMAP = NO;
 			};



More information about the Vm-dev mailing list