diff options
| author | Christian Rößler | 2018-11-29 16:42:39 +0100 |
|---|---|---|
| committer | Christian Rößler | 2018-11-29 16:42:39 +0100 |
| commit | 54bbd6a755b4411a9fcff1ecd5221a4469a52219 (patch) | |
| tree | 0f4354da55819abdcafee1b5f62dae485ee9e315 /core/modules/busybox/module.build | |
| parent | [run-virt] Linux scripts some changes: Desktop links, permiss. etc (diff) | |
| parent | [run-virt] Support lecture-specific sound muting (diff) | |
| download | mltk-54bbd6a755b4411a9fcff1ecd5221a4469a52219.tar.gz mltk-54bbd6a755b4411a9fcff1ecd5221a4469a52219.tar.xz mltk-54bbd6a755b4411a9fcff1ecd5221a4469a52219.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/mltk
Diffstat (limited to 'core/modules/busybox/module.build')
| -rw-r--r-- | core/modules/busybox/module.build | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/core/modules/busybox/module.build b/core/modules/busybox/module.build index e960849f..9214a484 100644 --- a/core/modules/busybox/module.build +++ b/core/modules/busybox/module.build @@ -15,7 +15,10 @@ fetch_source() { if ! grep -q 'suspend.*"no"' "util-linux/rtcwake.c"; then git apply "${MODULE_DIR}/rtcwake-compat.patch" || perror "Could not apply busybox patch for rtcwake compat with util-linux" fi - sed -i -r 's/^CC\s*=\s*(\S)/CC ?= \1/' Makefile || perror "Could not patch Makefile" + # make sure Makefile allows a preset CC + if [ -n "$CC" ]; then + sed -i -r 's/^CC\s*=\s*(\S)/CC ?= \1/' Makefile || perror "Could not patch Makefile" + fi cd .. || perror "cd .. failed" } |