diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-05-05 12:28:28 +0000 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2020-05-05 12:28:28 +0000 |
| commit | 34cad02bea04fbfcbe57f4513426af1eaa4862b5 (patch) | |
| tree | 0cc88f3be0b74075c74efcc32ff5e6656a44324e /coreconf/rules.mk | |
| parent | efbf8f55055730c9e5270efd6b112bb11eb1b0dc (diff) | |
| download | nss-hg-34cad02bea04fbfcbe57f4513426af1eaa4862b5.tar.gz | |
Bug 290526 Handle empty install variables r=rrelyea
Originally I added the install commands to the individual build
targets. But this breaks the incremental build, because there is
actually no dependency for the install. But it turns out, that
in the end it's enough to ignore empty defined variables, so just
do this.
Differential Revision: https://phabricator.services.mozilla.com/D69017
Diffstat (limited to 'coreconf/rules.mk')
| -rw-r--r-- | coreconf/rules.mk | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/coreconf/rules.mk b/coreconf/rules.mk index 74ca5c7f9..751c8c618 100644 --- a/coreconf/rules.mk +++ b/coreconf/rules.mk @@ -73,10 +73,10 @@ release_classes:: +$(LOOP_OVER_DIRS) libs program install:: $(TARGETS) -ifdef LIBRARY +ifneq ($(LIBRARY),) $(INSTALL) -m 664 $(LIBRARY) $(SOURCE_LIB_DIR) endif -ifdef SHARED_LIBRARY +ifneq ($(SHARED_LIBRARY),) $(INSTALL) -m 775 $(SHARED_LIBRARY) $(SOURCE_LIB_DIR) ifdef MOZ_DEBUG_SYMBOLS ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET))) @@ -84,10 +84,10 @@ ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET))) endif endif endif -ifdef IMPORT_LIBRARY +ifneq ($(IMPORT_LIBRARY),) $(INSTALL) -m 775 $(IMPORT_LIBRARY) $(SOURCE_LIB_DIR) endif -ifdef PROGRAM +ifneq ($(PROGRAM),) $(INSTALL) -m 775 $(PROGRAM) $(SOURCE_BIN_DIR) ifdef MOZ_DEBUG_SYMBOLS ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET))) @@ -95,7 +95,7 @@ ifeq (,$(filter-out _WIN%,$(NS_USE_GCC)_$(OS_TARGET))) endif endif endif -ifdef PROGRAMS +ifneq ($(PROGRAMS),) $(INSTALL) -m 775 $(PROGRAMS) $(SOURCE_BIN_DIR) endif +$(LOOP_OVER_DIRS) @@ -297,8 +297,7 @@ $(IMPORT_LIBRARY): $(MAPFILE) $(RANLIB) $@ endif ifeq ($(OS_ARCH),WINNT) -$(IMPORT_LIBRARY): $(LIBRARY) - cp -f $< $@ +$(IMPORT_LIBRARY): $(SHARED_LIBRARY) endif ifdef SHARED_LIBRARY_LIBS |