diff options
| author | Tony Theodore <tonyt@logyst.com> | 2020-12-05 23:17:40 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2020-12-05 23:17:40 (GMT) |
| commit | ef7640ab0270ec153d573c86f73db8b60414cd48 (patch) | |
| tree | 5fdf40a07fc9688e75879762581b028c31e65544 | |
| parent | 07717b7266af32f6c2e392454488168fe4e813d9 (diff) | |
| download | mxe-ef7640ab0270ec153d573c86f73db8b60414cd48.zip mxe-ef7640ab0270ec153d573c86f73db8b60414cd48.tar.gz mxe-ef7640ab0270ec153d573c86f73db8b60414cd48.tar.bz2 | |
darwin: workaround clang12 warnings now errors
| -rw-r--r-- | plugins/native/darwin/overrides.mk | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/plugins/native/darwin/overrides.mk b/plugins/native/darwin/overrides.mk index 62e50be..c949672 100644 --- a/plugins/native/darwin/overrides.mk +++ b/plugins/native/darwin/overrides.mk @@ -8,11 +8,12 @@ $(foreach PKG,$(filter ocaml%,$(PKGS)),\ $(foreach TGT,$(MXE_TARGETS),\ $(eval $(PKG)_BUILD_$(TGT) :=))) +# check-requirements is early in the dep chain +check-requirements: disable-native-jre cc-wrapper + # silence "install JDK" popups # move the rule to main Makefile if other systems abandon java # and conditionally include the dependency -check-requirements: disable-native-jre - .PHONY: disable-native-jre disable-native-jre: @mkdir -p '$(PREFIX)/$(BUILD)/bin' @@ -22,3 +23,14 @@ disable-native-jre: ) > '$(PREFIX)/$(BUILD)/bin/java' @chmod 0755 '$(PREFIX)/$(BUILD)/bin/java' @cp '$(PREFIX)/$(BUILD)/bin/java' '$(PREFIX)/$(BUILD)/bin/javac' + +# clang 12 has new errors +.PHONY: cc-wrapper +cc-wrapper: + @mkdir -p '$(PREFIX)/$(BUILD)/bin' + @( \ + echo '#!/bin/sh'; \ + echo '/usr/bin/cc -Wno-implicit-function-declaration "$$@"'; \ + ) > '$(PREFIX)/$(BUILD)/bin/cc' + @chmod 0755 '$(PREFIX)/$(BUILD)/bin/cc' + @cp '$(PREFIX)/$(BUILD)/bin/cc' '$(PREFIX)/$(BUILD)/bin/gcc' |