i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Use named parameters.

Browse Source 
* Use Object{Cc,C++}Flags instead of setting {CC,C++}FLAGS on the
  objects directly.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@21438 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2007-06-17 15:14:46 +00:00
parent baade5580e
commit f18b0dff8b
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/MainBuildRules
+3 -8
View File
@@ -497,7 +497,7 @@ rule BuildPlatformMergeObject
MergeObject $(target) : $(sources) : $(otherObjects) ; MergeObject $(target) : $(sources) : $(otherObjects) ;
} }
rule BuildPlatformMergeObjectPIC rule BuildPlatformMergeObjectPIC target : sources : otherObjects
{ {
# BuildPlatformMergeObjectPIC <name> : <sources> : <other objects> ; # BuildPlatformMergeObjectPIC <name> : <sources> : <other objects> ;
# Compiles source files and merges the object files to an object file. # Compiles source files and merges the object files to an object file.
@@ -508,13 +508,8 @@ rule BuildPlatformMergeObjectPIC
# <other objects>: Object files or static libraries to be merged. No grist # <other objects>: Object files or static libraries to be merged. No grist
# will be added. # will be added.
# #
local target = $(1) ; ObjectCcFlags $(sources) : $(HOST_PIC_CCFLAGS) ;
local sources = $(2) ; ObjectC++Flags $(sources) : $(HOST_PIC_C++FLAGS) ;
local otherObjects = $(3) ;
local objects = [ FGristFiles $(sources:S=$(SUFOBJ)) ] ;
CCFLAGS on $(objects) += $(HOST_PIC_CCFLAGS) ;
C++FLAGS on $(objects) += $(HOST_PIC_C++FLAGS) ;
BuildPlatformMergeObject $(target) : $(sources) : $(otherObjects) ; BuildPlatformMergeObject $(target) : $(sources) : $(otherObjects) ;
} }