Merge pull request #354 from guillep/fix/dylib-ignore-missing-prerequ…

…isites Ignore missing dylibs
OpenSmalltalk · Jan 17, 2019 · 0060623 · 0060623
2 parents 58ffe03 + a130922
commit 0060623
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/build.macos32x86/common/Makefile.app b/build.macos32x86/common/Makefile.app
@@ -120,11 +120,16 @@ $(APP)/Contents/Resources/%.bundle: $(BLDDIR)/vm/%.bundle
 		echo cp -pR $< $(APP)/Contents/Resources; \
 		cp -pR $< $(APP)/Contents/Resources; \
 	fi
-	
+
 $(APP)/Contents/MacOS/Plugins/%.dylib: $(BLDDIR)/vm/%.dylib
 	@mkdir -p $(APP)/Contents/MacOS/Plugins
-	cp -p $< $(APP)/Contents/MacOS/Plugins
-
+	@if [ -f $(basename $<).ignore ]; then \
+		echo $(notdir $<) is being ignored; \
+		rm -rf $^; \
+	else \
+		echo cp -p $< $(APP)/Contents/MacOS/Plugins; \
+		cp -p $< $(APP)/Contents/MacOS/Plugins; \
+	fi
 
 $(VMPLIST): $(OSXDIR)/$(SYSTEM)-Info.plist getversion
 	-mkdir -p $(APP)/Contents

diff --git a/build.macos64x64/common/Makefile.app b/build.macos64x64/common/Makefile.app
@@ -120,11 +120,16 @@ $(APP)/Contents/Resources/%.bundle: $(BLDDIR)/vm/%.bundle
 		echo cp -pR $< $(APP)/Contents/Resources; \
 		cp -pR $< $(APP)/Contents/Resources; \
 	fi
-	
+
 $(APP)/Contents/MacOS/Plugins/%.dylib: $(BLDDIR)/vm/%.dylib
 	@mkdir -p $(APP)/Contents/MacOS/Plugins
-	cp -p $< $(APP)/Contents/MacOS/Plugins
-
+	@if [ -f $(basename $<).ignore ]; then \
+		echo $(notdir $<) is being ignored; \
+		rm -rf $^; \
+	else \
+		echo cp -p $< $(APP)/Contents/MacOS/Plugins; \
+		cp -p $< $(APP)/Contents/MacOS/Plugins; \
+	fi
 
 $(VMPLIST): $(OSXDIR)/$(SYSTEM)-Info.plist getversion
 	-mkdir -p $(APP)/Contents