@@ -301,17 +301,18 @@ goversioncheck:
301
301
302
302
TRAY_RELEASE ?= packaging/tmp/crc-tray-macos.tar.gz
303
303
304
- embed-download : $(HOST_BUILD_DIR ) /crc-embedder
304
+ .PHONY : embed-download-windows embed-download-darwin
305
+ embed-download-windows embed-download-darwin : embed-download-% : $(HOST_BUILD_DIR ) /crc-embedder
305
306
ifeq ($(CUSTOM_EMBED ) ,false)
306
307
mkdir -p $(EMBED_DOWNLOAD_DIR)
307
- $(HOST_BUILD_DIR)/crc-embedder download $(EMBED_DOWNLOAD_DIR)
308
+ $(HOST_BUILD_DIR)/crc-embedder download --goos=$* $(EMBED_DOWNLOAD_DIR)
308
309
endif
309
310
310
311
macos-universal-binary : macos-release-binary $(TOOLS_BINDIR ) /makefat
311
312
mkdir -p out/macos-universal
312
313
cd $(BUILD_DIR ) && " $( TOOLS_BINDIR) " /makefat macos-universal/crc macos-amd64/crc macos-arm64/crc
313
314
314
- packagedir : clean embed-download macos-universal-binary
315
+ packagedir : clean embed-download-darwin macos-universal-binary
315
316
echo -n $(CRC_VERSION ) > packaging/VERSION
316
317
sed -e ' s/__VERSION__/' $(CRC_VERSION ) ' /g' -e ' s@__INSTALL_PATH__@$(MACOS_INSTALL_PATH)@g' packaging/darwin/Distribution.in > packaging/darwin/Distribution
317
318
sed -e ' s/__VERSION__/' $(CRC_VERSION ) ' /g' -e ' s@__INSTALL_PATH__@$(MACOS_INSTALL_PATH)@g' packaging/darwin/welcome.html.in > packaging/darwin/Resources/welcome.html
@@ -359,7 +360,7 @@ CRC_EXE=crc.exe
359
360
BUNDLE_NAME =crc_hyperv_$(OPENSHIFT_VERSION ) .$(BUNDLE_EXTENSION )
360
361
361
362
.PHONY : msidir
362
- msidir : clean embed-download $(HOST_BUILD_DIR ) /GenMsiWxs windows-release-binary $(PACKAGE_DIR ) /product.wxs.template
363
+ msidir : clean embed-download-windows $(HOST_BUILD_DIR ) /GenMsiWxs windows-release-binary $(PACKAGE_DIR ) /product.wxs.template
363
364
mkdir -p $(PACKAGE_DIR ) /msi
364
365
cp $(EMBED_DOWNLOAD_DIR ) /* $(PACKAGE_DIR ) /msi
365
366
cp $(HOST_BUILD_DIR ) /crc.exe $(PACKAGE_DIR ) /msi/$(CRC_EXE )
0 commit comments