瀏覽代碼

Merge branch 'macos_fixes' into 'master'

Make relibc buildable on macOS (not for macOS)

See merge request redox-os/relibc!179
Jeremy Soller 6 年之前
父節點
當前提交
4c9173433e
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 2 2
      Makefile
  2. 1 1
      include.sh

+ 2 - 2
Makefile

@@ -10,11 +10,11 @@ ifneq ($(TARGET),)
 endif
 
 ifeq ($(TARGET),aarch64-unknown-linux-gnu)
-	CC?=aarch64-linux-gnu-gcc
+	export CC=aarch64-linux-gnu-gcc
 endif
 
 ifeq ($(TARGET),x86_64-unknown-redox)
-	CC?=x86_64-unknown-redox-gcc
+	export CC=x86_64-unknown-redox-gcc
 endif
 
 SRC=\

+ 1 - 1
include.sh

@@ -11,7 +11,7 @@ do
     name="$(basename "$dir")"
     if [ "${name:0:1}" != "_" ]
     then
-        header="$include/${name/_/\/}.h"
+        header="$include/${name/_//}.h"
         pushd "$dir"
         cargo run --release --manifest-path "$cbindgen/Cargo.toml" -- \
             -c cbindgen.toml -o "$header" mod.rs