Changeset 86390 in vbox for trunk

Timestamp:

Oct 1, 2020 3:59:35 PM (4 years ago)

Author:

vboxsync

Message:

/Config.kmk,xpcom/Makefile.kmk: Better error message if we cannot find the libIDL config script.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/libs/xpcom18a4/Makefile.kmk (modified) (1 diff)

trunk/Config.kmk

@@ -2277 +2277 @@
   # libIDL-config (for xpcom18a4)
   ifeq ($(origin VBOX_LIBIDL_CONFIG),undefined)
-   export VBOX_LIBIDL_CONFIG := $(firstword $(shell which libIDL-config-2 libIDL-config 2> /dev/null))
+   export VBOX_LIBIDL_CONFIG := $(firstword $(which libIDL-config-2 libIDL-config) libIDL-config-2-not-found)
   endif
  endif

trunk/src/libs/xpcom18a4/Makefile.kmk

@@ -474 +474 @@
 else
  # We do these ONCE.
- ifndef VBOX_LIBIDL_CONFIG
-  $(error VBox: Missing libIDL package? VBOX_LIBIDL_CONFIG is empty, neither libIDL-config-2 nor libIDL-config was found)
- endif
- libIDL_config_cflags := $(shell $(VBOX_LIBIDL_CONFIG) --cflags)
- libIDL_config_libs   := $(shell $(VBOX_LIBIDL_CONFIG) --libs)
+ libIDL_config_cflags := $(shell "$(VBOX_LIBIDL_CONFIG)" --cflags)
+ libIDL_config_libs   := $(shell "$(VBOX_LIBIDL_CONFIG)" --libs)
  xpidl_CFLAGS = \
         $(libIDL_config_cflags)