use RC in /opt

mulle-cc · Jun 27, 2022 · 76cbd1c · 76cbd1c
1 parent 2175977
commit 76cbd1c
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 246 deletions.
diff --git a/clang/bin/cmake-make.linux b/clang/bin/cmake-make.linux
@@ -8,7 +8,8 @@
 #
 # MEMO: If you can't use ninja copy this file and make it cmake-make or so.
 PREFIX="${PREFIX:-/opt}"
-INSTALL_PREFIX="${PREFIX}/mulle-clang-project/${MULLE_CLANG_VERSION:-14.0.6.0}"
+# VERSION / RC are passed in via mulle-clang-cpack
+INSTALL_PREFIX="${PREFIX}/mulle-clang-project/${VERSION:-14.0.6.0}${RC}"
 
 [ ! -d build ] && mkdir build
 cd build &&

diff --git a/clang/bin/cmake-msbuild.windows b/clang/bin/cmake-msbuild.windows
@@ -1,4 +1,4 @@
-#! /bin/sh 
+#! /bin/sh
 
 # It's assumed that the mono repo is unpacked in the current directory as
 # mulle-clang-project. Lets build it in 'build'.
@@ -8,18 +8,19 @@
 #
 # MEMO: If you can't use ninja copy this file and make it cmake-make or so.
 PREFIX="${PREFIX:-${HOME}}"
-INSTALL_PREFIX="${PREFIX}/mulle-clang-project/${MULLE_CLANG_VERSION:-14.0.6.0}"
+# VERSION / RC are passed in via mulle-clang-cpack
+INSTALL_PREFIX="${PREFIX}/mulle-clang-project/${VERSION:-14.0.6.0}${RC}"
 
-if [ ! -d "${INSTALL_PREFIX}" ] 
-then 
+if [ ! -d "${INSTALL_PREFIX}" ]
+then
    mkdir -p "${INSTALL_PREFIX}" || exit 1
 fi
 
 
 [ ! -d build ] && mkdir build
 
 # assume on windows, cmake uses the proper VS-Studio version as default, so we don't
-# specify a generator 
+# specify a generator
 
 cd build &&
 cmake.exe \
@@ -42,15 +43,15 @@ cmake.exe --install . &&
    # rename stuff we need to mulle
    mv llvm-nm.exe mulle-nm.exe &&
 
-   for i in scan-build* clang-cl.exe 
+   for i in scan-build* clang-cl.exe
    do
       mv "$i" mulle-"$i"
    done &&
 
    # junk rest
    for i in *
-   do 
-      case "$i" in 
+   do
+      case "$i" in
          *.dll|mulle-*)
          ;;
 

diff --git a/clang/bin/cmake-ninja.darwin b/clang/bin/cmake-ninja.darwin
@@ -8,7 +8,8 @@
 #
 # MEMO: If you can't use ninja copy this file and make it cmake-make or so.
 PREFIX="${PREFIX:-/opt}"
-INSTALL_PREFIX="${PREFIX}/mulle-clang-project/${MULLE_CLANG_VERSION:-14.0.6.0}"
+# VERSION / RC are passed in via mulle-clang-cpack
+INSTALL_PREFIX="${PREFIX}/mulle-clang-project/${VERSION:-14.0.6.0}${RC}"
 
 [ ! -d build ] && mkdir build
 cd build &&

diff --git a/clang/bin/cmake-ninja.linux b/clang/bin/cmake-ninja.linux
@@ -12,7 +12,8 @@
 #
 # MEMO: If you can't use ninja copy this file and make it cmake-make or so.
 PREFIX="${PREFIX:-/opt}"
-INSTALL_PREFIX="${PREFIX}/mulle-clang-project/${MULLE_CLANG_VERSION:-14.0.6.0}"
+# VERSION / RC are passed in via mulle-clang-cpack
+INSTALL_PREFIX="${PREFIX}/mulle-clang-project/${VERSION:-14.0.6.0}${RC}"
 
 #
 # Careful! sudo swallows environment variables given on the command line

diff --git a/clang/bin/cmake-ninja.windows b/clang/bin/cmake-ninja.windows
@@ -1,4 +1,4 @@
-#! /bin/sh 
+#! /bin/sh
 
 # It's assumed that the mono repo is unpacked in the current directory as
 # mulle-clang-project. Lets build it in 'build'.
@@ -9,10 +9,11 @@
 # MEMO: If you can't use ninja copy this file and make it cmake-make or so.
 
 PREFIX="${PREFIX:-${HOME}}"
-INSTALL_PREFIX="${PREFIX}/mulle-clang-project/${MULLE_CLANG_VERSION:-14.0.6.0}"
+# VERSION / RC are passed in via mulle-clang-cpack
+INSTALL_PREFIX="${PREFIX}/mulle-clang-project/${VERSION:-14.0.6.0}${RC}"
 
-if [ ! -d "${INSTALL_PREFIX}" ] 
-then 
+if [ ! -d "${INSTALL_PREFIX}" ]
+then
    mkdir -p "${INSTALL_PREFIX}" || exit 1
 fi
 

diff --git a/clang/bin/mulle-clang-ide b/clang/bin/mulle-clang-ide
diff --git a/clang/lib/CodeGen/CGObjC.cpp b/clang/lib/CodeGen/CGObjC.cpp
@@ -914,7 +914,6 @@ llvm::Value   *CodeGenFunction::GetMetaABIParamAddressLValue( const Decl *FuncDe
    llvm::Type             *llvmPointerType;
    llvm::Value            *paramAddr;
    //unsigned               alignment ;
-   QualType               longType;
 
    MD = dyn_cast<ObjCMethodDecl>( FuncDecl);
          // return value: wrap scalar in aggregate, return pointer if in method

diff --git a/clang/lib/CodeGen/CGObjCMulleRuntime.cpp b/clang/lib/CodeGen/CGObjCMulleRuntime.cpp
@@ -1087,7 +1087,7 @@ namespace {
       /// GetOrEmitProtocol - Get the protocol object for the given
       /// declaration, emitting it if necessary. The return value has type
       /// ProtocolPtrTy.
-      virtual llvm::Constant *GetOrEmitProtocol(const ObjCProtocolDecl *PD)=0;
+      //virtual llvm::Constant *GetOrEmitProtocol(const ObjCProtocolDecl *PD)=0;
 
       /// GetOrEmitProtocolRef - Get a forward reference to the protocol
       /// object for the given declaration, emitting it if needed. These