equal
deleted
inserted
replaced
109 ifeq ($(STDCPP),1) |
109 ifeq ($(STDCPP),1) |
110 STDCPP_BUILD:=1 |
110 STDCPP_BUILD:=1 |
111 endif |
111 endif |
112 endif |
112 endif |
113 |
113 |
|
114 # Operator new linking depends on both the use of the NEWLIB keyword and whether a component supports a standard |
|
115 # CPP build. |
114 ifneq ($(NEWLIB),) |
116 ifneq ($(NEWLIB),) |
|
117 # If specified, always use the NEWLIB keyword value for operator new library linking |
115 NEWLIBFILE:=$(STATLIBDIR)/$(NEWLIB) |
118 NEWLIBFILE:=$(STATLIBDIR)/$(NEWLIB) |
116 else |
119 else |
117 ifeq ($(SYSTEM_TARGET),1) |
120 # If not performing a standard CPP build, link to an appropriate default Symbian new library. |
118 NEWLIBFILE:=$(STATLIBDIR)/$(DEFAULT_SYSTEM_NEWLIB) |
121 # Standard CPP components defer to the toolchain supplied libraries. |
119 else |
122 ifneq ($(STDCPP_BUILD),1) |
120 NEWLIBFILE:=$(STATLIBDIR)/$(DEFAULT_NORMAL_NEWLIB) |
123 ifeq ($(SYSTEM_TARGET),1) |
|
124 NEWLIBFILE:=$(STATLIBDIR)/$(DEFAULT_SYSTEM_NEWLIB) |
|
125 else |
|
126 NEWLIBFILE:=$(STATLIBDIR)/$(DEFAULT_NORMAL_NEWLIB) |
|
127 endif |
121 endif |
128 endif |
122 endif |
129 endif |
123 endif |
130 endif |
124 |
131 |
125 ifeq ($(STDCPP_BUILD),1) |
132 ifeq ($(STDCPP_BUILD),1) |