diff options
| author | Thorsten Behrens <tbehrens@novell.com> | 2010-10-06 00:36:17 +0200 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2010-10-06 00:41:05 +0200 |
| commit | cad37f247cb28791ce2bd3fed0d93f05fd0c5e40 (patch) | |
| tree | f813c80aecb819fd6491607a60c526c0f3ff278a /boost/makefile.mk | |
| parent | 716c0abd079a9e04c347fbd2be4825518813c46e (diff) | |
Fix broken win32 build in boost
Make boostthreadlib depend on PREDELIVER_FLAG_FILE, otherwise
the whole include path goodness is not working (i.e. first do the
predeliver to wntmsci12/inc, then build thread lib)
Diffstat (limited to 'boost/makefile.mk')
| -rw-r--r-- | boost/makefile.mk | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/boost/makefile.mk b/boost/makefile.mk index 3d80a8943143..691fdff5fd1b 100644 --- a/boost/makefile.mk +++ b/boost/makefile.mk @@ -116,13 +116,15 @@ $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) : $(PACKAGE_DIR)$/$(BUILD_FLAG_FILE) normalize: $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) +.IF "$(GUI)"!="WNT" + $(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : normalize -.IF "$(GUI)"=="WNT" +.ELSE -$(PACKAGE_DIR)/$(BUILD_FLAG_FILE) : boostthreadlib +$(PACKAGE_DIR)$/$(PREDELIVER_FLAG_FILE) : boostthreadlib -boostthreadlib : +boostthreadlib : $(PACKAGE_DIR)$/$(NORMALIZE_FLAG_FILE) cd $(PACKAGE_DIR)/$(TARFILE_ROOTDIR)/libs/thread/src/win32 && dmake $(MFLAGS) $(CALLMACROS) .ENDIF |