Changeset e76e833 in mainline

Timestamp:

2011-07-24T17:42:12Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

10f4b47c

Parents:

a8010272

Message:

Inclusion of pcc binaries is now optional.

Files:

• HelenOS.config (modified) (1 diff)
• boot/Makefile.common (modified) (2 diffs)
• uspace/Makefile (modified) (2 diffs)

HelenOS.config

@@ -565 +565 @@
 ! CONFIG_BAREBONE (n/y)
 
+% Build pcc binaries 
+! CONFIG_PCC (n/y)
+
 % Build binutils binaries 
 ! CONFIG_BINUTILS (n/y)

boot/Makefile.common

@@ -145 +145 @@
         $(USPACE_PATH)/app/blkdump/blkdump \
         $(USPACE_PATH)/app/bnchmark/bnchmark \
-        $(USPACE_PATH)/app/cc/cc \
-        $(USPACE_PATH)/app/ccom/ccom \
-        $(USPACE_PATH)/app/ccom/mkext/cc_mkext \
-        $(USPACE_PATH)/app/cpp/cpp \
         $(USPACE_PATH)/app/dltest/dltest \
         $(USPACE_PATH)/app/dltest2/dltest2 \
@@ -177 +173 @@
         $(USPACE_PATH)/app/websrv/websrv
 
+ifeq ($(CONFIG_PCC),y)
+RD_APPS_NON_ESSENTIAL += \
+        $(USPACE_PATH)/app/cc/cc \
+        $(USPACE_PATH)/app/ccom/ccom \
+        $(USPACE_PATH)/app/ccom/mkext/cc_mkext \
+        $(USPACE_PATH)/app/cpp/cpp
+endif
+
 ifeq ($(CONFIG_BINUTILS),y)
 RD_APPS_NON_ESSENTIAL += \

uspace/Makefile

@@ -37 +37 @@
         app/blkdump \
         app/bnchmark \
-        app/cc \
-        app/ccom \
-        app/ccom/mkext \
-        app/cpp \
         app/edit \
         app/ext2info \
@@ -115 +111 @@
         drv/bus/usb/vhc
 
+ifeq ($(CONFIG_PCC),y)
+DIRS += \
+        app/cc \
+        app/ccom \
+        app/ccom/mkext \
+        app/cpp
+endif
+
 ifeq ($(CONFIG_BINUTILS),y)
 DIRS += \