--- a/ProjectBuilder.st Sun Jan 26 13:41:15 2014 +0100
+++ b/ProjectBuilder.st Tue Jan 28 21:48:47 2014 +0100
@@ -942,7 +942,7 @@
!
makeWithOutputTo:stdOut errorTo:stdErr
- |module directory makeCommand|
+ |module directory makeCommand forceArg|
module := package module.
directory := package directory.
@@ -952,10 +952,13 @@
usedCompiler := ParserFlags usedCompiler.
].
makeCommand := self makeCommandOfCompiler:usedCompiler.
-
+ forceArg := ''.
+
"/ makeCommand := makeCommand, ' TOP=', mySTXTopDirectory pathName.
OperatingSystem isUNIXlike ifTrue:[
+ forceArg := ' FORCE='.
+
"/ generate the makefile first
self activityNotification:('sh %1/rules/stmkmf (in %2)'
bindWith:mySTXTopDirectory pathName
@@ -973,7 +976,7 @@
"/ generate the library
self activityNotification:(makeCommand,' classLibRule').
OperatingSystem
- executeCommand:(makeCommand,' classLibRule FORCE=')
+ executeCommand:(makeCommand,' classLibRule',forceArg)
inputFrom:nil
outputTo:stdOut
errorTo:stdErr
@@ -984,7 +987,7 @@
self activityNotification:(makeCommand,' exe').
OperatingSystem
"/ generate the executable
- executeCommand:(makeCommand,' exe FORCE=')
+ executeCommand:(makeCommand,' exe',forceArg)
inputFrom:nil
outputTo:stdOut
errorTo:stdErr
@@ -1004,8 +1007,7 @@
]
]
- "Modified: / 03-09-2012 / 19:47:15 / cg"
- "Modified (comment): / 06-09-2012 / 16:22:38 / cg"
+ "Modified: / 28-01-2014 / 21:48:07 / cg"
!
objDirForUsedCompiler