Skip to content

Commit 0dcce5d

Browse files
committed
giving up on macOS
1 parent e1517a3 commit 0dcce5d

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

Makefile.pre.in

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2123,25 +2123,27 @@ python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh
21232123
cp python-config.py python-config; \
21242124
fi
21252125

2126-
BUILD_SCRIPTS_DIR=build/scripts-$(VERSION)/
2127-
SCRIPT_2TO3=$(BUILD_SCRIPTS_DIR)2to3-$(VERSION)
2128-
SCRIPT_IDLE=$(BUILD_SCRIPTS_DIR)idle$(VERSION)
2129-
SCRIPT_PYDOC=$(BUILD_SCRIPTS_DIR)pydoc$(VERSION)
2130-
2131-
$(BUILD_SCRIPTS_DIR):
2132-
$(MKDIR_P) $@
2133-
2134-
$(SCRIPT_2TO3): $(BUILD_SCRIPTS_DIR) $(srcdir)/Tools/scripts/2to3
2126+
# macOS' make seems to ignore a dependency on a
2127+
# "$(BUILD_SCRIPTS_DIR): $(MKDIR_P) $@" rule.
2128+
BUILD_SCRIPTS_DIR=build/scripts-$(VERSION)
2129+
SCRIPT_2TO3=$(BUILD_SCRIPTS_DIR)/2to3-$(VERSION)
2130+
SCRIPT_IDLE=$(BUILD_SCRIPTS_DIR)/idle$(VERSION)
2131+
SCRIPT_PYDOC=$(BUILD_SCRIPTS_DIR)/pydoc$(VERSION)
2132+
2133+
$(SCRIPT_2TO3): $(srcdir)/Tools/scripts/2to3
2134+
@$(MKDIR_P) $(BUILD_SCRIPTS_DIR)
21352135
sed -e "s,/usr/bin/env python3,$(EXENAME)," < $(srcdir)/Tools/scripts/2to3 > $@
2136-
chmod +x $@
2136+
@chmod +x $@
21372137

2138-
$(SCRIPT_IDLE): $(BUILD_SCRIPTS_DIR) $(srcdir)/Tools/scripts/idle3
2138+
$(SCRIPT_IDLE): $(srcdir)/Tools/scripts/idle3
2139+
@$(MKDIR_P) $(BUILD_SCRIPTS_DIR)
21392140
sed -e "s,/usr/bin/env python3,$(EXENAME)," < $(srcdir)/Tools/scripts/idle3 > $@
2140-
chmod +x $@
2141+
@chmod +x $@
21412142

2142-
$(SCRIPT_PYDOC): $(BUILD_SCRIPTS_DIR) $(srcdir)/Tools/scripts/pydoc3
2143+
$(SCRIPT_PYDOC): $(srcdir)/Tools/scripts/pydoc3
2144+
@$(MKDIR_P) $(BUILD_SCRIPTS_DIR)
21432145
sed -e "s,/usr/bin/env python3,$(EXENAME)," < $(srcdir)/Tools/scripts/pydoc3 > $@
2144-
chmod +x $@
2146+
@chmod +x $@
21452147

21462148
scripts: $(SCRIPT_2TO3) $(SCRIPT_IDLE) $(SCRIPT_PYDOC) python-config
21472149

0 commit comments

Comments
 (0)