Clean up how the language libraries refer to plat headers; they should be using
the +pkg forms of the rules and getting the headers via the paths in descr, rather than depending on the +headers version.
This commit is contained in:
		
							parent
							
								
									c5aff6fc2e
								
							
						
					
					
						commit
						c569ca15d8
					
				
					 8 changed files with 12 additions and 12 deletions
				
			
		|  | @ -10,8 +10,8 @@ for _, plat in ipairs(vars.plats) do | |||
| 		hdrs = {}, -- must be empty | ||||
| 		deps = { | ||||
| 			"h+emheaders", | ||||
| 			"lang/cem/libcc.ansi/headers+headers", | ||||
| 			"plat/"..plat.."/include+headers", | ||||
| 			"lang/cem/libcc.ansi/headers+pkg", | ||||
| 			"plat/"..plat.."/include+pkg", | ||||
| 		}, | ||||
|         vars = { plat = plat } | ||||
|     } | ||||
|  |  | |||
|  | @ -51,8 +51,8 @@ for _, plat in ipairs(vars.plats) do | |||
| 		}, | ||||
| 		hdrs = {}, -- must be empty | ||||
| 		deps = { | ||||
| 			"lang/cem/libcc.ansi/headers+headers", | ||||
| 			"plat/"..plat.."/include+headers", | ||||
| 			"lang/cem/libcc.ansi/headers+pkg", | ||||
| 			"plat/"..plat.."/include+pkg", | ||||
| 			"./malloc/malloc.h", | ||||
| 			"./math/localmath.h", | ||||
| 			"./stdio/loc_incl.h", | ||||
|  |  | |||
|  | @ -29,8 +29,8 @@ for _, plat in ipairs(vars.plats) do | |||
|         }, | ||||
| 		hdrs = {}, -- must be empty | ||||
| 		deps = { | ||||
| 			"lang/cem/libcc.ansi/headers+headers", | ||||
| 			"plat/"..plat.."/include+headers", | ||||
| 			"lang/cem/libcc.ansi/headers+pkg", | ||||
| 			"plat/"..plat.."/include+pkg", | ||||
| 			"h+emheaders", | ||||
| 		}, | ||||
|         vars = { plat = plat } | ||||
|  |  | |||
|  | @ -17,8 +17,8 @@ for _, plat in ipairs(vars.plats) do | |||
|         }, | ||||
| 		hdrs = {}, -- must be empty | ||||
| 		deps = { | ||||
| 			"lang/cem/libcc.ansi/headers+headers", | ||||
| 			"plat/"..plat.."/include+headers", | ||||
| 			"lang/cem/libcc.ansi/headers+pkg", | ||||
| 			"plat/"..plat.."/include+pkg", | ||||
| 			"h+emheaders", | ||||
| 		}, | ||||
|         vars = { plat = plat } | ||||
|  |  | |||
|  | @ -1,4 +1,4 @@ | |||
| installable { | ||||
| 	name = "headers", | ||||
| 	name = "pkg", | ||||
| 	map = { "plat/osx/include+pkg" } | ||||
| } | ||||
|  |  | |||
|  | @ -27,7 +27,7 @@ acklibrary { | |||
| 	}, | ||||
| 	deps = { | ||||
| 		"lang/cem/libcc.ansi/headers+headers", | ||||
| 		"plat/osx386/include+headers", | ||||
| 		"plat/osx386/include+pkg", | ||||
| 	}, | ||||
| 	vars = { | ||||
| 		plat = "osx386" | ||||
|  |  | |||
|  | @ -1,4 +1,4 @@ | |||
| installable { | ||||
| 	name = "headers", | ||||
| 	name = "pkg", | ||||
| 	map = { "plat/osx/include+pkg" } | ||||
| } | ||||
|  | @ -27,7 +27,7 @@ acklibrary { | |||
| 	}, | ||||
| 	deps = { | ||||
| 		"lang/cem/libcc.ansi/headers+headers", | ||||
| 		"plat/osxppc/include+headers", | ||||
| 		"plat/osxppc/include+pkg", | ||||
| 	}, | ||||
| 	vars = { | ||||
| 		plat = "osxppc" | ||||
|  |  | |||
		Loading…
	
	Add table
		
		Reference in a new issue