Mercurial > hg > release > icedtea7-forest-2.4 > hotspot
changeset 5107:49cada8e39b9 jdk7u55-b11
8014460: Need to check for non-empty EXT_LIBS_PATH before using it
Reviewed-by: tbell, collins, sla, coleenp
| author | dholmes |
|---|---|
| date | Fri, 28 Feb 2014 17:30:14 +0000 |
| parents | bc52bce9e569 |
| children | 2c47e6310e00 |
| files | make/bsd/makefiles/arm.make make/linux/makefiles/arm.make |
| diffstat | 2 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/make/bsd/makefiles/arm.make Mon Mar 03 09:19:30 2014 -0800 +++ b/make/bsd/makefiles/arm.make Fri Feb 28 17:30:14 2014 +0000 @@ -1,5 +1,5 @@ # -# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -24,6 +24,8 @@ Obj_Files += bsd_arm.o -LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a +ifneq ($(EXT_LIBS_PATH),) + LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a +endif CFLAGS += -DVM_LITTLE_ENDIAN
--- a/make/linux/makefiles/arm.make Mon Mar 03 09:19:30 2014 -0800 +++ b/make/linux/makefiles/arm.make Fri Feb 28 17:30:14 2014 +0000 @@ -1,5 +1,5 @@ # -# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -24,6 +24,8 @@ Obj_Files += linux_arm.o -LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a +ifneq ($(EXT_LIBS_PATH),) + LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a +endif CFLAGS += -DVM_LITTLE_ENDIAN