View | Details | Raw Unified | Return to issue 16698
Collapse All | Expand All

(-)makefile.mk.~1.4.2.2.~ (-3 / +4 lines)
Lines 122-128 Link Here
122
	$(BUILD_ACTION_SEP) devenv /build Release /project _symtable pcbuild.sln /useenv \
122
	$(BUILD_ACTION_SEP) devenv /build Release /project _symtable pcbuild.sln /useenv \
123
	$(BUILD_ACTION_SEP) devenv /build Release /project _socket pcbuild.sln /useenv  \
123
	$(BUILD_ACTION_SEP) devenv /build Release /project _socket pcbuild.sln /useenv  \
124
	$(BUILD_ACTION_SEP) devenv /build Release /project _sre pcbuild.sln /useenv  \
124
	$(BUILD_ACTION_SEP) devenv /build Release /project _sre pcbuild.sln /useenv  \
125
   	$(BUILD_ACTION_SEP) devenv /build Release /project python pcbuild.sln /useenv
125
	$(BUILD_ACTION_SEP) devenv /build Release /project python pcbuild.sln /useenv
126
.ELSE
126
.ELSE
127
BUILD_ACTION=msdev pcbuild.dsw /USEENV /MAKE 	\
127
BUILD_ACTION=msdev pcbuild.dsw /USEENV /MAKE 	\
128
	"python - Win32 Release" 	\
128
	"python - Win32 Release" 	\
Lines 176-182 Link Here
176
$(PYTHONCORESHL) : makefile.mk $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
176
$(PYTHONCORESHL) : makefile.mk $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE)
177
.IF "$(OS)" == "SOLARIS"
177
.IF "$(OS)" == "SOLARIS"
178
	ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -h libpython.so.$(PYMAJOR) -lm -ldl -lc -lpthread
178
	ld -G -o $@ -u Py_Main -u Py_FrozenMain -u PyFPE_dummy $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a -h libpython.so.$(PYMAJOR) -lm -ldl -lc -lpthread
179
.ENDIF
179
.ELSE
180
.IF "$(OS)" == "FREEBSD"
180
.IF "$(OS)" == "FREEBSD"
181
	ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
181
	ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -lutil ${PTHREAD_LIBS}
182
.ELSE
182
.ELSE
Lines 186-192 Link Here
186
	echo "$(OS)"
186
	echo "$(OS)"
187
	ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -ldl -lutil -lc -lpthread
187
	ld -shared -o $@ --whole-archive $(MISC)$/build$/$(TARFILE_NAME)$/libpython$(PYMAJOR).$(PYMINOR).a --no-whole-archive -soname libpython.so.$(PYMAJOR)  -lm -ldl -lutil -lc -lpthread
188
.ENDIF # IRIX
188
.ENDIF # IRIX
189
.ENDIF
189
.ENDIF # FREEBSD
190
.ENDIF # SOLARIS
190
191
191
$(PYTHONCORELINK1) : makefile.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
192
$(PYTHONCORELINK1) : makefile.mk $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE)
192
	-rm -f $@
193
	-rm -f $@

Return to issue 16698