Tue, 14 May 2013 07:24:50 -0400
8014460: Need to check for non-empty EXT_LIBS_PATH before using it
Reviewed-by: tbell, collins, sla, coleenp
make/bsd/makefiles/arm.make | file | annotate | diff | comparison | revisions | |
make/linux/makefiles/arm.make | file | annotate | diff | comparison | revisions |
1.1 --- a/make/bsd/makefiles/arm.make Fri May 10 11:27:55 2013 -0700 1.2 +++ b/make/bsd/makefiles/arm.make Tue May 14 07:24:50 2013 -0400 1.3 @@ -1,5 +1,5 @@ 1.4 # 1.5 -# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. 1.6 +# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. 1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.8 # 1.9 # This code is free software; you can redistribute it and/or modify it 1.10 @@ -24,6 +24,8 @@ 1.11 1.12 Obj_Files += bsd_arm.o 1.13 1.14 -LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a 1.15 +ifneq ($(EXT_LIBS_PATH),) 1.16 + LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a 1.17 +endif 1.18 1.19 CFLAGS += -DVM_LITTLE_ENDIAN
2.1 --- a/make/linux/makefiles/arm.make Fri May 10 11:27:55 2013 -0700 2.2 +++ b/make/linux/makefiles/arm.make Tue May 14 07:24:50 2013 -0400 2.3 @@ -1,5 +1,5 @@ 2.4 # 2.5 -# Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved. 2.6 +# Copyright (c) 2008, 2013, Oracle and/or its affiliates. All rights reserved. 2.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.8 # 2.9 # This code is free software; you can redistribute it and/or modify it 2.10 @@ -24,6 +24,8 @@ 2.11 2.12 Obj_Files += linux_arm.o 2.13 2.14 -LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a 2.15 +ifneq ($(EXT_LIBS_PATH),) 2.16 + LIBS += $(EXT_LIBS_PATH)/sflt_glibc.a 2.17 +endif 2.18 2.19 CFLAGS += -DVM_LITTLE_ENDIAN