From 162b78734ae66c7bf8026d7c476b2c20e914060c Mon Sep 17 00:00:00 2001 From: dholmes Date: Tue, 14 May 2013 07:24:50 -0400 Subject: [PATCH] 8014460: Need to check for non-empty EXT_LIBS_PATH before using it Reviewed-by: tbell, collins, sla, coleenp --- make/bsd/makefiles/arm.make | 6 ++++-- make/linux/makefiles/arm.make | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/make/bsd/makefiles/arm.make b/make/bsd/makefiles/arm.make index e22d5c375..f35f70a57 100644 --- a/make/bsd/makefiles/arm.make +++ b/make/bsd/makefiles/arm.make @@ -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 diff --git a/make/linux/makefiles/arm.make b/make/linux/makefiles/arm.make index 6d7079e56..ff8e3c519 100644 --- a/make/linux/makefiles/arm.make +++ b/make/linux/makefiles/arm.make @@ -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 -- GitLab