Browse code

* protect CC renames affecting subsequent builds

Nat! authored on 23-09-2017 20:25:20
Showing 4 changed files
... ...
@@ -1,3 +1,7 @@
1
+### 3.13.4
2
+
3
+* protect CC renames affecting subsequent builds
4
+
1 5
 ### 3.13.3
2 6
 
3 7
 * add --lenient flag to mulle-bootstrap, used in mulle-bootstrap git to not abort on failure
... ...
@@ -31,7 +31,7 @@
31 31
 #
32 32
 MULLE_EXECUTABLE_VERSION_MAJOR=3
33 33
 MULLE_EXECUTABLE_VERSION_MINOR=13
34
-MULLE_EXECUTABLE_VERSION_PATCH=3
34
+MULLE_EXECUTABLE_VERSION_PATCH=4
35 35
 
36 36
 MULLE_EXECUTABLE_VERSION="${MULLE_EXECUTABLE_VERSION_MAJOR}.${MULLE_EXECUTABLE_VERSION_MINOR}.${MULLE_EXECUTABLE_VERSION_PATCH}"
37 37
 
... ...
@@ -2288,7 +2288,11 @@ configure"`"
2288 2288
 
2289 2289
       for configuration in ${configurations}
2290 2290
       do
2291
-         build_with_configuration_sdk_preferences "${name}" "${configuration}" "${sdk}" "${preferences}"
2291
+         #
2292
+         # let it run in subshell so environment variable changes (like CC)
2293
+         # do not affect next build
2294
+         #
2295
+         ( build_with_configuration_sdk_preferences "${name}" "${configuration}" "${sdk}" "${preferences}" )
2292 2296
          if [ $? -ne 0 ]
2293 2297
          then
2294 2298
             fail "Don't know how to build ${name}"
... ...
@@ -625,12 +625,15 @@ _run_git_on_stash()
625 625
 {
626 626
    local i="$1" ; shift
627 627
 
628
+   local name
629
+
628 630
    if [ -d "${i}/.git" -o -d "${i}/refs" ]
629 631
    then
632
+      name="`basename -- "${i}"`"
630 633
       log_info "### $i:"
631 634
       (
632
-         cd "$i" ;
633
-         exekutor git ${GITFLAGS} "$@" ${GITOPTIONS}  >&2
635
+         cd "$i"  &&
636
+         REPOSITORY="${name}" eval_exekutor "git" "${GITFLAGS}" "$@" "${GITOPTIONS}"  >&2
634 637
       )
635 638
       if [ $? -ne 0 -a "${MULLE_FLAG_LENIENT}" = "NO" ]
636 639
       then