Changeset 1259 for trunk/kBuild/tools/GXX64.kmk

Timestamp:

Nov 7, 2007, 5:02:56 PM (18 years ago)

Author:

bird

Message:

Don't basename the library file, just strip leading 'lib'.

File:

• trunk/kBuild/tools/GXX64.kmk (modified) (3 diffs)

trunk/kBuild/tools/GXX64.kmk

@@ -254 +254 @@
         $(QUIET)$(TOOL_GXX64_LD) $(flags) -o $(out) $(objs)\
                 $(foreach p,$(libpath), -L$(p))\
-                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
+                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))\
                 $(call TOOL_GXX64_LD_MAP,$(outbase).map)
 endef
@@ -281 +281 @@
                 $(objs)\
                 $(foreach p,$(libpath), -L$(p))\
-                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
+                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))\
                 $(call TOOL_GXX64_LD_MAP,$(outbase).map)
 endef
@@ -306 +306 @@
         $(QUIET)$(TOOL_GXX64_LD_SYSMOD) $(TOOL_GXX64_LDFLAGS.sysmod) $(flags) -o $(out) $(objs)\
                 $(foreach p,$(libpath), -L$(p))\
-                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(basename $(lib))), $(lib)))\
+                $(foreach lib,$(libs), $(if $(findstring $(lib),$(subst /,x,$(lib))), -l$(patsubst lib%,%,$(lib)), $(lib)))\
                 $(call TOOL_GXX64_LD_SYSMOD_MAP,$(outbase).map)
 endef