diff options
| author | Mike Buland <eichlan@xagasoft.com> | 2012-04-05 22:52:54 +0000 |
|---|---|---|
| committer | Mike Buland <eichlan@xagasoft.com> | 2012-04-05 22:52:54 +0000 |
| commit | ea17d3262924f95a4fa721b3de6d7fe499bdcf14 (patch) | |
| tree | ba19ba5662548e94342cd922b19942cf2052781f /share | |
| parent | a1a513a3ec36a960f8b17dbbef04481771dc140f (diff) | |
| download | build-ea17d3262924f95a4fa721b3de6d7fe499bdcf14.tar.gz build-ea17d3262924f95a4fa721b3de6d7fe499bdcf14.tar.bz2 build-ea17d3262924f95a4fa721b3de6d7fe499bdcf14.tar.xz build-ea17d3262924f95a4fa721b3de6d7fe499bdcf14.zip | |
Added unique function and a workaround for non-matching inputs to rules passing
the rule input filter.
Diffstat (limited to 'share')
| -rw-r--r-- | share/autoinclude/general-rules.bld | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/share/autoinclude/general-rules.bld b/share/autoinclude/general-rules.bld index cdc2d40..6c0df30 100644 --- a/share/autoinclude/general-rules.bld +++ b/share/autoinclude/general-rules.bld | |||
| @@ -60,6 +60,7 @@ rule "exe" | |||
| 60 | input "*.o"; | 60 | input "*.o"; |
| 61 | profile "build" | 61 | profile "build" |
| 62 | { | 62 | { |
| 63 | INPUT = [INPUT].unique().matches("*.o"); | ||
| 63 | execute("${CXX} -o ${OUTPUT} ${INPUT} ${LDFLAGS}"); | 64 | execute("${CXX} -o ${OUTPUT} ${INPUT} ${LDFLAGS}"); |
| 64 | } | 65 | } |
| 65 | } | 66 | } |
| @@ -69,6 +70,7 @@ rule "so" | |||
| 69 | input "*.o"; | 70 | input "*.o"; |
| 70 | profile "build" | 71 | profile "build" |
| 71 | { | 72 | { |
| 73 | INPUT = [INPUT].unique().matches("*.o"); | ||
| 72 | execute("${CXX} -shared -o ${OUTPUT} ${INPUT} ${LDFLAGS}"); | 74 | execute("${CXX} -shared -o ${OUTPUT} ${INPUT} ${LDFLAGS}"); |
| 73 | } | 75 | } |
| 74 | } | 76 | } |
| @@ -78,6 +80,7 @@ rule "lib" | |||
| 78 | input "*.o"; | 80 | input "*.o"; |
| 79 | profile "build" | 81 | profile "build" |
| 80 | { | 82 | { |
| 83 | INPUT = [INPUT].unique().matches("*.o"); | ||
| 81 | execute("${AR} cr ${OUTPUT} ${INPUT}"); | 84 | execute("${AR} cr ${OUTPUT} ${INPUT}"); |
| 82 | } | 85 | } |
| 83 | } | 86 | } |
